From 3eb8dd78a622d257a7fed279714428c3de906f93 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Sat, 14 Mar 2009 00:27:40 +0000 Subject: [PATCH] Remove dead DeclarationName constructors that involving knowing about the internal implementation of Selector. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66996 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/DeclarationName.h | 20 -------------------- lib/AST/DeclarationName.cpp | 3 +++ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/include/clang/AST/DeclarationName.h b/include/clang/AST/DeclarationName.h index bc9f674f3c..77e5024e37 100644 --- a/include/clang/AST/DeclarationName.h +++ b/include/clang/AST/DeclarationName.h @@ -132,26 +132,6 @@ private: Ptr |= StoredDeclarationNameExtra; } - // Construct a declaration name from a zero- or one-argument - // Objective-C selector. - DeclarationName(IdentifierInfo *II, unsigned numArgs) - : Ptr(reinterpret_cast(II)) { - assert((Ptr & PtrMask) == 0 && "Improperly aligned IdentifierInfo"); - assert(numArgs < 2 && "Use MultiKeywordSelector for >= 2 arguments"); - if (numArgs == 0) - Ptr |= StoredObjCZeroArgSelector; - else - Ptr |= StoredObjCOneArgSelector; - } - - // Construct a declaration name from an Objective-C multiple-keyword - // selector. - DeclarationName(MultiKeywordSelector *SI) - : Ptr(reinterpret_cast(SI)) { - assert((Ptr & PtrMask) == 0 && "Improperly aligned MultiKeywordSelector"); - Ptr |= StoredDeclarationNameExtra; - } - /// Construct a declaration name from a raw pointer. DeclarationName(uintptr_t Ptr) : Ptr(Ptr) { } diff --git a/lib/AST/DeclarationName.cpp b/lib/AST/DeclarationName.cpp index c1077c189b..3815a08a65 100644 --- a/lib/AST/DeclarationName.cpp +++ b/lib/AST/DeclarationName.cpp @@ -63,16 +63,19 @@ DeclarationName::DeclarationName(Selector Sel) { switch (Sel.getNumArgs()) { case 0: Ptr = reinterpret_cast(Sel.getAsIdentifierInfo()); + assert((Ptr & PtrMask) == 0 && "Improperly aligned IdentifierInfo"); Ptr |= StoredObjCZeroArgSelector; break; case 1: Ptr = reinterpret_cast(Sel.getAsIdentifierInfo()); + assert((Ptr & PtrMask) == 0 && "Improperly aligned IdentifierInfo"); Ptr |= StoredObjCOneArgSelector; break; default: Ptr = Sel.InfoPtr & ~Selector::ArgFlags; + assert((Ptr & PtrMask) == 0 && "Improperly aligned MultiKeywordSelector"); Ptr |= StoredDeclarationNameExtra; break; } -- 2.40.0