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

Revert r312139 "Verifier: Verify the correctness of fragment expressions attached to globals." 

This caused PR34390.

llvm-svn: 312182
This commit is contained in:
Hans Wennborg 2017-08-30 22:41:27 +00:00
parent aa25e5bab2
commit 76794daf05
2 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
llvm/lib/IR/Verifier.cpp
View File

@ -507,10 +507,6 @@ private:
void verifySiblingFuncletUnwinds();
void verifyFragmentExpression(const DbgInfoIntrinsic &I);
template <typename ValueOrMetadata>
void verifyFragmentExpression(const DIVariable &V,
DIExpression::FragmentInfo Fragment,
ValueOrMetadata *Desc);
void verifyFnArgs(const DbgInfoIntrinsic &I);
/// Module-level debug info verification...
@ -1182,11 +1178,8 @@ void Verifier::visitDIExpression(const DIExpression &N) {
void Verifier::visitDIGlobalVariableExpression(
const DIGlobalVariableExpression &GVE) {
AssertDI(GVE.getVariable(), "missing variable");
if (auto *Expr = GVE.getExpression()) {
if (auto *Expr = GVE.getExpression())
visitDIExpression(*Expr);
if (auto Fragment = Expr->getFragmentInfo())
verifyFragmentExpression(*GVE.getVariable(), *Fragment, &GVE);
}
}
void Verifier::visitDIObjCProperty(const DIObjCProperty &N) {
@ -4495,7 +4488,7 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgIntrinsicTy &DII) {
verifyFnArgs(DII);
}
static uint64_t getVariableSize(const DIVariable &V) {
static uint64_t getVariableSize(const DILocalVariable &V) {
// Be careful of broken types (checked elsewhere).
const Metadata *RawType = V.getRawType();
while (RawType) {
@ -4534,7 +4527,7 @@ void Verifier::verifyFragmentExpression(const DbgInfoIntrinsic &I) {
if (!V || !E || !E->isValid())
return;
// Nothing to do if this isn't a DW_OP_LLVM_fragment expression.
// Nothing to do if this isn't a bit piece expression.
auto Fragment = E->getFragmentInfo();
if (!Fragment)
return;
@ -4548,24 +4541,17 @@ void Verifier::verifyFragmentExpression(const DbgInfoIntrinsic &I) {
if (V->isArtificial())
return;
verifyFragmentExpression(*V, *Fragment, &I);
}
template <typename ValueOrMetadata>
void Verifier::verifyFragmentExpression(const DIVariable &V,
DIExpression::FragmentInfo Fragment,
ValueOrMetadata *Desc) {
// If there's no size, the type is broken, but that should be checked
// elsewhere.
uint64_t VarSize = getVariableSize(V);
uint64_t VarSize = getVariableSize(*V);
if (!VarSize)
return;
unsigned FragSize = Fragment.SizeInBits;
unsigned FragOffset = Fragment.OffsetInBits;
unsigned FragSize = Fragment->SizeInBits;
unsigned FragOffset = Fragment->OffsetInBits;
AssertDI(FragSize + FragOffset <= VarSize,
"fragment is larger than or outside of variable", Desc, &V);
AssertDI(FragSize != VarSize, "fragment covers entire variable", Desc, &V);
"fragment is larger than or outside of variable", &I, V, E);
AssertDI(FragSize != VarSize, "fragment covers entire variable", &I, V, E);
}
void Verifier::verifyFnArgs(const DbgInfoIntrinsic &I) {

19
llvm/test/Verifier/fragment.ll
View File

@ -1,19 +0,0 @@
; RUN: not opt -S <%s 2>&1| FileCheck %s
; CHECK: fragment is larger than or outside of variable
; CHECK: !DIGlobalVariableExpression(var: ![[VAR:[0-9]+]],
; CHECK-SAME: expr: !DIExpression(DW_OP_LLVM_fragment, 0, 64))
; CHECK: ![[VAR]] = !DIGlobalVariable(name: "g"
@g = common global i32 0, align 4, !dbg !0
!llvm.dbg.cu = !{!1}
!llvm.module.flags = !{!6, !7}
!0 = !DIGlobalVariableExpression(var: !3, expr: !DIExpression(DW_OP_LLVM_fragment, 0, 64))
!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2, emissionKind: FullDebug)
!2 = !DIFile(filename: "a.c", directory: "/")
!3 = !DIGlobalVariable(name: "g", scope: !1, file: !2, line: 1, type: !5, isLocal: false, isDefinition: true)
!5 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!6 = !{i32 2, !"Dwarf Version", i32 4}
!7 = !{i32 2, !"Debug Info Version", i32 3}