From f79084e8e5cf4042d0553bea5d67e7a7f4a58de9 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Tue, 13 May 2014 11:20:16 +0000 Subject: [PATCH] Drop AST's version of ARMCXXABI, it doesn't differ from the Itanium base class. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208687 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/ASTContext.cpp | 5 ++--- lib/AST/CXXABI.h | 1 - lib/AST/ItaniumCXXABI.cpp | 9 --------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 3b15e282bb..822ae54ae5 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -678,11 +678,10 @@ CXXABI *ASTContext::createCXXABI(const TargetInfo &T) { if (!LangOpts.CPlusPlus) return nullptr; switch (T.getCXXABI().getKind()) { - case TargetCXXABI::GenericARM: + case TargetCXXABI::GenericARM: // Same as Itanium at this level case TargetCXXABI::iOS: case TargetCXXABI::iOS64: - return CreateARMCXXABI(*this); - case TargetCXXABI::GenericAArch64: // Same as Itanium at this level + case TargetCXXABI::GenericAArch64: case TargetCXXABI::GenericItanium: return CreateItaniumCXXABI(*this); case TargetCXXABI::Microsoft: diff --git a/lib/AST/CXXABI.h b/lib/AST/CXXABI.h index 89203f18ca..12b929b88d 100644 --- a/lib/AST/CXXABI.h +++ b/lib/AST/CXXABI.h @@ -44,7 +44,6 @@ public: }; /// Creates an instance of a C++ ABI class. -CXXABI *CreateARMCXXABI(ASTContext &Ctx); CXXABI *CreateItaniumCXXABI(ASTContext &Ctx); CXXABI *CreateMicrosoftCXXABI(ASTContext &Ctx); } diff --git a/lib/AST/ItaniumCXXABI.cpp b/lib/AST/ItaniumCXXABI.cpp index ffa2ddc337..b5f8c0f4bc 100644 --- a/lib/AST/ItaniumCXXABI.cpp +++ b/lib/AST/ItaniumCXXABI.cpp @@ -89,17 +89,8 @@ public: return new ItaniumNumberingContext(); } }; - -class ARMCXXABI : public ItaniumCXXABI { -public: - ARMCXXABI(ASTContext &Ctx) : ItaniumCXXABI(Ctx) { } -}; } CXXABI *clang::CreateItaniumCXXABI(ASTContext &Ctx) { return new ItaniumCXXABI(Ctx); } - -CXXABI *clang::CreateARMCXXABI(ASTContext &Ctx) { - return new ARMCXXABI(Ctx); -} -- 2.40.0