Eliminate all of the placeholder identifiers used for constructors,

destructors, and conversion functions. The placeholders were used to
work around the fact that the parser and some of Sema really wanted
declarators to have simple identifiers; now, the code that deals with
declarators will use DeclarationNames.

llvm-svn: 59469

1 files changed, 2 insertions, 28 deletions

diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index b83266d1ff8..38bdb7e630c 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -42,8 +42,7 @@ IdentifierInfo::IdentifierInfo() {
 
 IdentifierTable::IdentifierTable(const LangOptions &LangOpts)
   // Start with space for 8K identifiers.
-  : HashTable(8192), 
-    ConstructorId(0), DestructorId(0), ConversionFunctionId(0) {
+  : HashTable(8192) {
 
   // Populate the identifier table with info about keywords for the current
   // language.
@@ -53,32 +52,7 @@ IdentifierTable::IdentifierTable(const LangOptions &LangOpts)
 
 // This cstor is intended to be used only for serialization.
 IdentifierTable::IdentifierTable() 
-  : HashTable(8192), 
-    ConstructorId(0), DestructorId(0), ConversionFunctionId(0) { }
-
-/// getConstructorId - Return a placeholder identifier for a C++
-/// constructor.
-IdentifierInfo &IdentifierTable::getConstructorId() {
-  if (!ConstructorId)
-    ConstructorId = &get("<constructor>");
-  return *ConstructorId;
-}
-
-/// getDestructorId - Return a placeholder identifier for a C++
-/// destructor.
-IdentifierInfo &IdentifierTable::getDestructorId() {
-  if (!DestructorId)
-    DestructorId = &get("<destructor>");
-  return *DestructorId;
-}
-
-/// getConversionFunctionId - Return a placeholder identifier for a
-/// C++ conversion function.
-IdentifierInfo &IdentifierTable::getConversionFunctionId() {
-  if (!ConversionFunctionId)
-    ConversionFunctionId = &get("<conversion function>");
-  return *ConversionFunctionId;
-}
+  : HashTable(8192) { }
 
 //===----------------------------------------------------------------------===//
 // Language Keyword Implementation