6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-04 10:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert "DebugInfo: Loosen DILexicalBlock constructor"

Browse Source 
This reverts commit r234222, while I look into bot failures [1].  I'll
recommit soon.

[1]: http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_check/7117/

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234225 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith 2015-04-06 21:30:23 +00:00
parent 4f67d9167d
commit 1114e434b0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/IR/DebugInfo.h
View File

@ -704,7 +704,7 @@ public:
class DILexicalBlock : public DIScope {
public:
explicit DILexicalBlock(const MDNode *N = nullptr) : DIScope(N) {}
DILexicalBlock(const MDLexicalBlockBase *N) : DIScope(N) {}
DILexicalBlock(const MDLexicalBlock *N) : DIScope(N) {}
MDLexicalBlockBase *get() const {
return cast_or_null<MDLexicalBlockBase>(DIDescriptor::get());
@ -745,12 +745,10 @@ public:
return *get();
}
DIScope getContext() const { return get()->getScope(); }
DIScope getContext() const { return getScope(); }
unsigned getLineNumber() const { return getScope().getLineNumber(); }
unsigned getColumnNumber() const { return getScope().getColumnNumber(); }
DILexicalBlock getScope() const {
return dyn_cast<MDLexicalBlockBase>(get()->getScope());
}
DILexicalBlock getScope() const { return DILexicalBlock(get()->getScope()); }
unsigned getDiscriminator() const { return get()->getDiscriminator(); }
};
@ -1052,9 +1050,11 @@ public:
// Since discriminators are associated with lexical blocks, make
// sure this location is a lexical block before retrieving its
// value.
if (auto *F = dyn_cast<MDLexicalBlockFile>(get()->getScope()))
return F->getDiscriminator();
return 0;
return getScope().isLexicalBlockFile()
? DILexicalBlockFile(
cast<MDNode>(cast<MDLocation>(DbgNode)->getScope()))
.getDiscriminator()
: 0;
}
/// \brief Generate a new discriminator value for this location.