DwarfCompileUnit: Fix another assertion failure on malformed input

that is not rejected by the Verifier.

Thanks to Björn Pettersson for providing a reproducer!

llvm-svn: 331535

2 files changed, 2 insertions, 1 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 4a5c7b324d6..32b6657c2fd 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -234,7 +234,7 @@ DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(
     // 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);
   }
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
index 7d6d45e64d6..952b0d99a95 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
@@ -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() {