Go back to using just the selector name for the getter and setter
in the property debug info. Any more isn't necessary after all.
rdar://11144023
llvm-svn: 153659
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index fa26d47..af55a86 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -165,6 +165,15 @@
return StringRef(StrPtr, OS.tell());
}
+/// getSelectorName - Return selector name. This is used for debugging
+/// info.
+StringRef CGDebugInfo::getSelectorName(Selector S) {
+ const std::string &SName = S.getAsString();
+ char *StrPtr = DebugInfoNames.Allocate<char>(SName.size());
+ memcpy(StrPtr, SName.data(), SName.size());
+ return StringRef(StrPtr, SName.size());
+}
+
/// getClassName - Get class name including template argument list.
StringRef
CGDebugInfo::getClassName(const RecordDecl *RD) {
@@ -1318,13 +1327,11 @@
SourceLocation Loc = PD->getLocation();
llvm::DIFile PUnit = getOrCreateFile(Loc);
unsigned PLine = getLineNumber(Loc);
- ObjCMethodDecl *GDecl = PD->getGetterMethodDecl();
- ObjCMethodDecl *SDecl = PD->getSetterMethodDecl();
llvm::MDNode *PropertyNode =
DBuilder.createObjCProperty(PD->getName(),
PUnit, PLine,
- GDecl ? getObjCMethodName(GDecl) : "",
- SDecl ? getObjCMethodName(SDecl) : "",
+ getSelectorName(PD->getGetterName()),
+ getSelectorName(PD->getSetterName()),
PD->getPropertyAttributes(),
getOrCreateType(PD->getType(), PUnit));
EltTys.push_back(PropertyNode);
@@ -1381,13 +1388,11 @@
SourceLocation Loc = PD->getLocation();
llvm::DIFile PUnit = getOrCreateFile(Loc);
unsigned PLine = getLineNumber(Loc);
- ObjCMethodDecl *GDecl = PD->getGetterMethodDecl();
- ObjCMethodDecl *SDecl = PD->getSetterMethodDecl();
PropertyNode =
DBuilder.createObjCProperty(PD->getName(),
PUnit, PLine,
- GDecl ? getObjCMethodName(GDecl) : "",
- SDecl ? getObjCMethodName(SDecl) : "",
+ getSelectorName(PD->getGetterName()),
+ getSelectorName(PD->getSetterName()),
PD->getPropertyAttributes(),
getOrCreateType(PD->getType(),PUnit));
}