diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index 1edc0850c..ac6fbf5de 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);
 
@@ -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");
     }
 }
 
@@ -4959,4 +4957,4 @@ Declaration* Parser::GetDeclarationFromFriend(clang::NamedDecl* FriendDecl)
         Decl->lineNumberEnd = MinLineNumberEnd;
     }
     return Decl;
-}
\ No newline at end of file
+}