There are two ways to map a variable to its lexical scope. Lexical scope information is embedded in MDNode describing the variable. It is also available as a part of DebugLoc attached with DBG_VALUE instruction. DebugLoc attached with an instruction is less reliable in optimized code so use information embedded in the MDNode.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135629 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2011-07-20 22:18:50 +00:00
parent 747032522f
commit 40c7e4142e
3 changed files with 18 additions and 2 deletions

View File

@ -614,6 +614,8 @@ namespace llvm {
return (getUnsignedField(6) & FlagArtificial) != 0;
}
/// getInlinedAt - If this variable is inlined then return inline location.
MDNode *getInlinedAt();
/// Verify - Verify that a variable descriptor is well formed.
bool Verify() const;

View File

@ -116,6 +116,12 @@ unsigned DIVariable::getNumAddrElements() const {
return DbgNode->getNumOperands()-8;
}
/// getInlinedAt - If this variable is inlined then return inline location.
MDNode *DIVariable::getInlinedAt() {
if (getVersion() <= llvm::LLVMDebugVersion9)
return NULL;
return dyn_cast_or_null<MDNode>(DbgNode->getOperand(7));
}
//===----------------------------------------------------------------------===//
// Predicates

View File

@ -1410,8 +1410,16 @@ DwarfDebug::collectVariableInfo(const MachineFunction *MF,
if (DV.getTag() == dwarf::DW_TAG_arg_variable &&
DISubprogram(DV.getContext()).describes(MF->getFunction()))
Scope = CurrentFnDbgScope;
else
Scope = findDbgScope(MInsn->getDebugLoc());
else {
if (DV.getVersion() <= LLVMDebugVersion9)
Scope = findDbgScope(MInsn->getDebugLoc());
else {
if (MDNode *IA = DV.getInlinedAt())
Scope = InlinedDbgScopeMap.lookup(DebugLoc::getFromDILocation(IA));
else
Scope = DbgScopeMap.lookup(cast<MDNode>(DV->getOperand(1)));
}
}
// If variable scope is not found then skip this variable.
if (!Scope)
continue;