commit b2db8e47e2a9cbd7fea6acc2794c42a8fc1182be
author Eric Christopher <echristo@apple.com> Wed Feb 08 01:53:14 2012 +0000
committer Eric Christopher <echristo@apple.com> Wed Feb 08 01:53:14 2012 +0000
tree c342000caf5beaa7e36704df5b409e2123e0da9e
parent 3434b19d63328364fd43ec5ae284c2c75f77e512

Constify the getClassName routine and variables that come out of it,
and then use it for forward decl names.

Part of rdar://10209967 and rdar://10400981

llvm-svn: 150040

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 13a0666..1392091 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -163,8 +163,8 @@
 
 /// getClassName - Get class name including template argument list.
 StringRef 
-CGDebugInfo::getClassName(RecordDecl *RD) {
-  ClassTemplateSpecializationDecl *Spec
+CGDebugInfo::getClassName(const RecordDecl *RD) {
+  const ClassTemplateSpecializationDecl *Spec
     = dyn_cast<ClassTemplateSpecializationDecl>(RD);
   if (!Spec)
     return RD->getName();
@@ -486,12 +486,15 @@
 
   llvm::DIFile DefUnit = getOrCreateFile(RD->getLocation());
   unsigned Line = getLineNumber(RD->getLocation());
+  StringRef RDName = RD->getName();
 
   // Get the tag.
   const CXXRecordDecl *CXXDecl = dyn_cast<CXXRecordDecl>(RD);
   unsigned Tag = 0;
-  if (CXXDecl)
+  if (CXXDecl) {
+    RDName = getClassName(RD);
     Tag = llvm::dwarf::DW_TAG_class_type;
+  }
   else if (RD->isStruct())
     Tag = llvm::dwarf::DW_TAG_structure_type;
   else if (RD->isUnion())
@@ -500,7 +503,7 @@
     llvm_unreachable("Unknown RecordDecl type!");
 
   // Create the type.
-  return DBuilder.createForwardDecl(Tag, RD->getName(), DefUnit,
+  return DBuilder.createForwardDecl(Tag, RDName, DefUnit,
                                     Line);
 }