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
This commit is contained in:
Eric Christopher 2012-03-29 17:31:33 +00:00
parent 5d2b8d9042
commit bd9c910c8c
2 changed files with 14 additions and 9 deletions

View File

@ -165,6 +165,15 @@ StringRef CGDebugInfo::getObjCMethodName(const ObjCMethodDecl *OMD) {
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 @@ llvm::DIType CGDebugInfo::CreateType(const ObjCInterfaceType *Ty,
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 @@ llvm::DIType CGDebugInfo::CreateType(const ObjCInterfaceType *Ty,
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));
}

View File

@ -1,6 +1,6 @@
// RUN: %clang_cc1 -S -emit-llvm -g %s -o - | FileCheck %s
// CHECK: metadata !"p1", metadata !6, i32 5, metadata !"-[I1 p1]", metadata !"-[I1 setP1:]", i32 2316, metadata !9} ; [ DW_TAG_APPLE_property ]
// CHECK: metadata !"p1", metadata !6, i32 5, metadata !"p1", metadata !"setP1:", i32 2316, metadata !9} ; [ DW_TAG_APPLE_property ]
@interface I1
@property int p1;
@end