[llvm] r331535 - DwarfCompileUnit: Fix another assertion failure on malformed input
Adrian Prantl via llvm-commits
llvm-commits at lists.llvm.org
Fri May 4 09:10:43 PDT 2018
Author: adrian
Date: Fri May 4 09:10:43 2018
New Revision: 331535
URL: http://llvm.org/viewvc/llvm-project?rev=331535&view=rev
Log:
DwarfCompileUnit: Fix another assertion failure on malformed input
that is not rejected by the Verifier.
Thanks to Björn Pettersson for providing a reproducer!
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h
llvm/trunk/test/DebugInfo/X86/global-expression.ll
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=331535&r1=331534&r2=331535&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri May 4 09:10:43 2018
@@ -234,7 +234,7 @@ DIE *DwarfCompileUnit::getOrCreateGlobal
// It would be better if this were unconditional, but malformed input that
// mixes non-fragments and fragments for the same variable is too expensive
// to detect in the verifier.
- if (!DwarfExpr->isMemoryLocation())
+ if (DwarfExpr->isUnknownLocation())
DwarfExpr->setMemoryLocationKind();
DwarfExpr->addExpression(Expr);
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h?rev=331535&r1=331534&r2=331535&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfExpression.h Fri May 4 09:10:43 2018
@@ -212,6 +212,7 @@ public:
void addUnsignedConstant(const APInt &Value);
bool isMemoryLocation() const { return LocationKind == Memory; }
+ bool isUnknownLocation() const { return LocationKind == Unknown; }
/// Lock this down to become a memory location description.
void setMemoryLocationKind() {
Modified: llvm/trunk/test/DebugInfo/X86/global-expression.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/global-expression.ll?rev=331535&r1=331534&r2=331535&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/global-expression.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/global-expression.ll Fri May 4 09:10:43 2018
@@ -17,7 +17,7 @@ target datalayout = "e-m:o-i64:64-f80:12
target triple = "x86_64-apple-macosx10.13.0"
@i = global i32 23, align 4
- at indirect = global i32* @i, align 8, !dbg !6, !dbg !0, !dbg !14, !dbg !15
+ at indirect = global i32* @i, align 8, !dbg !6, !dbg !0, !dbg !14, !dbg !15, !dbg !16
!llvm.dbg.cu = !{!2}
!llvm.module.flags = !{!10, !11, !12, !13}
@@ -39,3 +39,4 @@ target triple = "x86_64-apple-macosx10.1
; This is malformed, but too expensive to detect in the verifier.
!14 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression())
!15 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression(DW_OP_LLVM_fragment, 0, 1))
+!16 = !DIGlobalVariableExpression(var: !7, expr: !DIExpression(DW_OP_deref, DW_OP_constu, 1, DW_OP_plus, DW_OP_stack_value))
More information about the llvm-commits
mailing list