maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Factor code. No functionality change. 

llvm-svn: 102262
This commit is contained in:
Benjamin Kramer 2010-04-24 20:19:58 +00:00
parent 7d3360f123
commit bbb5deace6
2 changed files with 38 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,27 +320,9 @@ llvm::DIType CGDebugInfo::CreateType(const BlockPointerType *Ty,
FieldOffset = 0; FieldOffset = 0;
FType = CGM.getContext().UnsignedLongTy; FType = CGM.getContext().UnsignedLongTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "reserved", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType); EltTys.push_back(CreateMemberType(Unit, FType, "Size", &FieldOffset));
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"reserved", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().UnsignedLongTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"Size", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
Elements = DebugFactory.GetOrCreateArray(EltTys.data(), EltTys.size()); Elements = DebugFactory.GetOrCreateArray(EltTys.data(), EltTys.size());
EltTys.clear(); EltTys.clear();
@ -360,49 +342,13 @@ llvm::DIType CGDebugInfo::CreateType(const BlockPointerType *Ty,
FieldOffset = 0; FieldOffset = 0;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "__isa", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__isa", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().IntTy; FType = CGM.getContext().IntTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "__flags", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType); EltTys.push_back(CreateMemberType(Unit, FType, "__reserved", &FieldOffset));
FieldAlign = CGM.getContext().getTypeAlign(FType); EltTys.push_back(CreateMemberType(Unit, FType, "__FuncPtr", &FieldOffset));
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit, EltTys.push_back(CreateMemberType(Unit, FType, "__reserved", &FieldOffset));
"__flags", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().IntTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__reserved", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__FuncPtr", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = DescTy; FieldTy = DescTy;
FieldSize = CGM.getContext().getTypeSize(Ty); FieldSize = CGM.getContext().getTypeSize(Ty);
@ -1325,6 +1271,21 @@ llvm::DIType CGDebugInfo::CreateTypeNode(QualType Ty,
return llvm::DIType(); return llvm::DIType();
} }
/// CreateMemberType - Create new member and increase Offset by FType's size.
llvm::DIType CGDebugInfo::CreateMemberType(llvm::DIFile Unit, QualType FType,
llvm::StringRef Name,
uint64_t *Offset) {
llvm::DIType FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
uint64_t FieldSize = CGM.getContext().getTypeSize(FType);
unsigned FieldAlign = CGM.getContext().getTypeAlign(FType);
llvm::DIType Ty = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member,
Unit, Name, Unit, 0,
FieldSize, FieldAlign,
*Offset, 0, FieldTy);
*Offset += FieldSize;
return Ty;
}
/// EmitFunctionStart - Constructs the debug code for entering a function - /// EmitFunctionStart - Constructs the debug code for entering a function -
/// "llvm.dbg.func.start.". /// "llvm.dbg.func.start.".
void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, QualType FnType, void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, QualType FnType,
@ -1348,17 +1309,15 @@ void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, QualType FnType,
} }
} }
Name = getFunctionName(FD); Name = getFunctionName(FD);
if (!Name.empty() && Name[0] == '\01')
Name = Name.substr(1);
// Use mangled name as linkage name for c/c++ functions. // Use mangled name as linkage name for c/c++ functions.
CGM.getMangledName(LinkageName, GD); CGM.getMangledName(LinkageName, GD);
} else { } else {
// Use llvm function name as linkage name. // Use llvm function name as linkage name.
Name = Fn->getName(); Name = Fn->getName();
LinkageName.setString(Name); LinkageName.setString(Name);
if (!Name.empty() && Name[0] == '\01')
Name = Name.substr(1);
} }
if (!Name.empty() && Name[0] == '\01')
Name = Name.substr(1);
// It is expected that CurLoc is set before using EmitFunctionStart. // It is expected that CurLoc is set before using EmitFunctionStart.
// Usually, CurLoc points to the left bracket location of compound // Usually, CurLoc points to the left bracket location of compound
@ -1444,72 +1403,19 @@ llvm::DIType CGDebugInfo::EmitTypeForVarWithBlocksAttr(const ValueDecl *VD,
FieldOffset = 0; FieldOffset = 0;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
llvm::DIType FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "__isa", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType); EltTys.push_back(CreateMemberType(Unit, FType, "__forwarding", &FieldOffset));
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__isa", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__forwarding", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().IntTy; FType = CGM.getContext().IntTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "__flags", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType); EltTys.push_back(CreateMemberType(Unit, FType, "__size", &FieldOffset));
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__flags", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().IntTy;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__size", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
bool HasCopyAndDispose = CGM.BlockRequiresCopying(Type); bool HasCopyAndDispose = CGM.BlockRequiresCopying(Type);
if (HasCopyAndDispose) { if (HasCopyAndDispose) {
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "__copy_helper",
FieldSize = CGM.getContext().getTypeSize(FType); &FieldOffset));
FieldAlign = CGM.getContext().getTypeAlign(FType); EltTys.push_back(CreateMemberType(Unit, FType, "__destroy_helper",
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit, &FieldOffset));
"__copy_helper", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
"__destroy_helper", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
} }
CharUnits Align = CGM.getContext().getDeclAlign(VD); CharUnits Align = CGM.getContext().getDeclAlign(VD);
@ -1524,20 +1430,12 @@ llvm::DIType CGDebugInfo::EmitTypeForVarWithBlocksAttr(const ValueDecl *VD,
llvm::APInt pad(32, NumPaddingBytes); llvm::APInt pad(32, NumPaddingBytes);
FType = CGM.getContext().getConstantArrayType(CGM.getContext().CharTy, FType = CGM.getContext().getConstantArrayType(CGM.getContext().CharTy,
pad, ArrayType::Normal, 0); pad, ArrayType::Normal, 0);
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); EltTys.push_back(CreateMemberType(Unit, FType, "", &FieldOffset));
FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = CGM.getContext().getTypeAlign(FType);
FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member,
Unit, "", Unit,
0, FieldSize, FieldAlign,
FieldOffset, 0, FieldTy);
EltTys.push_back(FieldTy);
FieldOffset += FieldSize;
} }
} }
FType = Type; FType = Type;
FieldTy = CGDebugInfo::getOrCreateType(FType, Unit); llvm::DIType FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
FieldSize = CGM.getContext().getTypeSize(FType); FieldSize = CGM.getContext().getTypeSize(FType);
FieldAlign = Align.getQuantity()*8; FieldAlign = Align.getQuantity()*8;

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

@ -196,6 +196,9 @@ private:
/// CreateTypeNode - Create type metadata for a source language type. /// CreateTypeNode - Create type metadata for a source language type.
llvm::DIType CreateTypeNode(QualType Ty, llvm::DIFile F); llvm::DIType CreateTypeNode(QualType Ty, llvm::DIFile F);
llvm::DIType CreateMemberType(llvm::DIFile Unit, QualType FType,
llvm::StringRef Name, uint64_t *Offset);
/// getFunctionName - Get function name for the given FunctionDecl. If the /// getFunctionName - Get function name for the given FunctionDecl. If the
/// name is constructred on demand (e.g. C++ destructor) then the name /// name is constructred on demand (e.g. C++ destructor) then the name
/// is stored on the side. /// is stored on the side.