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

Maintain a map of regions (lexical scopes) and use it to find context for a global variable. 

llvm-svn: 94817
This commit is contained in:
Devang Patel 2010-01-29 18:11:03 +00:00
parent aecfa9adf9
commit 92e2541599
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,17 +50,13 @@ void CGDebugInfo::setLocation(SourceLocation Loc) {
}
/// getContextDescriptor - Get context info for the decl.
llvm::DIDescriptor CGDebugInfo::getContextDescriptor(const VarDecl *Decl,
llvm::DIDescriptor CGDebugInfo::getContextDescriptor(const Decl *D,
llvm::DIDescriptor &CompileUnit) {
if (Decl->isFileVarDecl())
return CompileUnit;
if (Decl->getDeclContext()->isFunctionOrMethod()) {
// Find the last subprogram in region stack.
for (unsigned RI = RegionStack.size(), RE = 0; RI != RE; --RI) {
llvm::DIDescriptor R(RegionStack[RI - 1]);
if (R.isSubprogram())
return R;
}
if (const Decl *Parent = dyn_cast<Decl>(D->getDeclContext())) {
llvm::DenseMap<const Decl *, llvm::WeakVH>::iterator
I = RegionMap.find(Parent);
if (I != RegionMap.end())
return llvm::DIDescriptor(dyn_cast_or_null<llvm::MDNode>(I->second));
}
return CompileUnit;
}
@ -1273,6 +1269,7 @@ void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, QualType FnType,
llvm::DISubprogram SP(dyn_cast_or_null<llvm::MDNode>(FI->second));
if (!SP.isNull() && SP.isSubprogram() && SP.isDefinition()) {
RegionStack.push_back(SP.getNode());
RegionMap[D] = llvm::WeakVH(SP.getNode());
return;
}
}
@ -1303,6 +1300,7 @@ void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, QualType FnType,
// Push function on region stack.
RegionStack.push_back(SP.getNode());
RegionMap[D] = llvm::WeakVH(SP.getNode());
}

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

@ -61,6 +61,7 @@ class CGDebugInfo {
llvm::DIType BlockLiteralGeneric;
std::vector<llvm::TrackingVH<llvm::MDNode> > RegionStack;
llvm::DenseMap<const Decl *, llvm::WeakVH> RegionMap;
/// DebugInfoNames - This is a storage for names that are
/// constructed on demand. For example, C++ destructors, C++ operators etc..
@ -172,7 +173,7 @@ private:
CGBuilderTy &Builder, CodeGenFunction *CGF);
/// getContextDescriptor - Get context info for the decl.
llvm::DIDescriptor getContextDescriptor(const VarDecl *Decl,
llvm::DIDescriptor getContextDescriptor(const Decl *Decl,
llvm::DIDescriptor &CU);
/// getOrCreateCompileUnit - Get the compile unit from the cache or create a