replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporarily revert r162066 and r162062 to see if it brings the gdb 

bots back.

llvm-svn: 162080
This commit is contained in:
Eric Christopher 2012-08-17 04:42:07 +00:00
parent 122a3a8e6f
commit 8d9ccdc7a5
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@ -351,54 +351,40 @@ llvm::DIType CGDebugInfo::CreateType(const BuiltinType *BT) {
case BuiltinType::Void: case BuiltinType::Void:
return llvm::DIType(); return llvm::DIType();
case BuiltinType::ObjCClass: case BuiltinType::ObjCClass:
if (ClassTy.Verify()) return DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type,
return ClassTy; "objc_class", TheCU,
ClassTy = DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type, getOrCreateMainFile(), 0);
"objc_class", TheCU,
getOrCreateMainFile(), 0);
return ClassTy;
case BuiltinType::ObjCId: { case BuiltinType::ObjCId: {
// typedef struct objc_class *Class; // typedef struct objc_class *Class;
// typedef struct objc_object { // typedef struct objc_object {
// Class isa; // Class isa;
// } *id; // } *id;
if (ObjTy.Verify()) // TODO: Cache these two types to avoid duplicates.
return ObjTy; llvm::DIType OCTy =
DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type,
if (!ClassTy.Verify()) "objc_class", TheCU, getOrCreateMainFile(), 0);
ClassTy = DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type,
"objc_class", TheCU,
getOrCreateMainFile(), 0);
unsigned Size = CGM.getContext().getTypeSize(CGM.getContext().VoidPtrTy); unsigned Size = CGM.getContext().getTypeSize(CGM.getContext().VoidPtrTy);
llvm::DIType ISATy = DBuilder.createPointerType(ClassTy, Size); llvm::DIType ISATy = DBuilder.createPointerType(OCTy, Size);
llvm::MDNode *ObjNode = DBuilder.createStructType(TheCU, "objc_object", SmallVector<llvm::Value *, 16> EltTys;
getOrCreateMainFile(),
0, 0, 0, 0,
llvm::DIArray());
SmallVector<llvm::Value *, 1> EltTys;
llvm::DIType FieldTy = llvm::DIType FieldTy =
DBuilder.createMemberType(llvm::DIDescriptor(ObjNode), "isa", DBuilder.createMemberType(getOrCreateMainFile(), "isa",
getOrCreateMainFile(), 0, Size, getOrCreateMainFile(), 0, Size,
0, 0, 0, ISATy); 0, 0, 0, ISATy);
EltTys.push_back(FieldTy); EltTys.push_back(FieldTy);
llvm::DIArray Elements = DBuilder.getOrCreateArray(EltTys); llvm::DIArray Elements = DBuilder.getOrCreateArray(EltTys);
ObjNode->replaceOperandWith(10, Elements); return DBuilder.createStructType(TheCU, "objc_object",
ObjTy = llvm::DIType(ObjTy); getOrCreateMainFile(),
return ObjTy; 0, 0, 0, 0, Elements);
} }
case BuiltinType::ObjCSel: { case BuiltinType::ObjCSel: {
if (SelTy.Verify()) return
return SelTy;
SelTy =
DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type, DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type,
"objc_selector", TheCU, getOrCreateMainFile(), "objc_selector", TheCU, getOrCreateMainFile(),
0); 0);
return SelTy;
} }
case BuiltinType::UChar: case BuiltinType::UChar:
case BuiltinType::Char_U: Encoding = llvm::dwarf::DW_ATE_unsigned_char; break; case BuiltinType::Char_U: Encoding = llvm::dwarf::DW_ATE_unsigned_char; break;

3
clang/lib/CodeGen/CGDebugInfo.h
View File

@ -50,9 +50,6 @@ class CGDebugInfo {
llvm::DICompileUnit TheCU; llvm::DICompileUnit TheCU;
SourceLocation CurLoc, PrevLoc; SourceLocation CurLoc, PrevLoc;
llvm::DIType VTablePtrType; llvm::DIType VTablePtrType;
llvm::DIType ClassTy;
llvm::DIType ObjTy;
llvm::DIType SelTy;
/// TypeCache - Cache of previously constructed Types. /// TypeCache - Cache of previously constructed Types.
llvm::DenseMap<void *, llvm::WeakVH> TypeCache; llvm::DenseMap<void *, llvm::WeakVH> TypeCache;