From 101933e940cbdec13c6f357e10fd902d2a134c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matos?= Date: Wed, 7 Feb 2024 17:04:09 +0000 Subject: [PATCH 1/2] ABI handling fixes in Parser.cpp --- src/CppParser/Parser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index 1edc0850c..9e47a29a9 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -234,7 +234,7 @@ ConvertToClangTargetCXXABI(CppSharp::CppParser::AST::CppAbi abi) case CppSharp::CppParser::AST::CppAbi::ARM: return TargetCXXABI::GenericARM; case CppSharp::CppParser::AST::CppAbi::AArch64: - return TargetCXXABI::GenericARM; + return TargetCXXABI::GenericAArch64; case CppSharp::CppParser::AST::CppAbi::iOS: return TargetCXXABI::iOS; case CppSharp::CppParser::AST::CppAbi::AppleARM64: @@ -731,7 +731,7 @@ void Parser::WalkVTable(const clang::CXXRecordDecl* RD, Class* C) } break; } - case TargetCXXABI::GenericItanium: + default: { ItaniumVTableContext VTContext(AST); @@ -4959,4 +4959,4 @@ Declaration* Parser::GetDeclarationFromFriend(clang::NamedDecl* FriendDecl) Decl->lineNumberEnd = MinLineNumberEnd; } return Decl; -} \ No newline at end of file +} From f84bb4c5f56f2b64376e4b1ae17710c5fd6a21d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matos?= Date: Wed, 7 Feb 2024 17:07:44 +0000 Subject: [PATCH 2/2] Update Parser.cpp --- src/CppParser/Parser.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index 9e47a29a9..ac6fbf5de 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -739,8 +739,6 @@ void Parser::WalkVTable(const clang::CXXRecordDecl* RD, Class* C) C->layout->layout = WalkVTableLayout(VTLayout); break; } - default: - llvm_unreachable("Unsupported C++ ABI kind"); } }