From: Adrian Prantl <aprantl@apple.com>
Date: Fri, 15 Nov 2013 23:21:39 +0000 (+0000)
Subject: Replace the dangling context hotfix with an assertion.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6bc810a49983e12006ba7a0dba61f7b2534b8f26;p=oota-llvm.git

Replace the dangling context hotfix with an assertion.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194883 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 508a6927c20..a47eeab430c 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -886,10 +886,7 @@ DIE *CompileUnit::getOrCreateTypeDIE(const MDNode *TyNode) {
   // Construct the context before querying for the existence of the DIE in case
   // such construction creates the DIE.
   DIE *ContextDIE = getOrCreateContextDIE(resolve(Ty.getContext()));
-  // TODO: Investigate if this beavior is intentional and possibly
-  // replace it with an assert.
-  if (!ContextDIE)
-    ContextDIE = getCUDie();
+  assert(ContextDIE);
 
   DIE *TyDIE = getDIE(Ty);
   if (TyDIE)