<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Apr 5, 2016 at 8:07 PM, Davide Italiano via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: davide<br>
Date: Tue Apr  5 22:07:58 2016<br>
New Revision: 265514<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=265514&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=265514&view=rev</a><br>
Log:<br>
[IRVerifier] Avoid crashing on an invalid compile unit.<br>
<br>
Added:<br>
    llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll<br>
Modified:<br>
    llvm/trunk/lib/IR/Verifier.cpp<br>
<br>
Modified: llvm/trunk/lib/IR/Verifier.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=265514&r1=265513&r2=265514&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=265514&r1=265513&r2=265514&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/Verifier.cpp (original)<br>
+++ llvm/trunk/lib/IR/Verifier.cpp Tue Apr  5 22:07:58 2016<br>
@@ -4376,13 +4376,14 @@ void Verifier::verifyTypeRefs() {<br>
   // Visit all the compile units again to map the type references.<br>
   SmallDenseMap<const MDString *, const DIType *, 32> TypeRefs;<br>
   for (auto *CU : CUs->operands())<br>
-    if (auto Ts = cast<DICompileUnit>(CU)->getRetainedTypes())<br>
-      for (DIType *Op : Ts)<br>
-        if (auto *T = dyn_cast_or_null<DICompositeType>(Op))<br>
-          if (auto *S = T->getRawIdentifier()) {<br>
-            UnresolvedTypeRefs.erase(S);<br>
-            TypeRefs.insert(std::make_pair(S, T));<br>
-          }<br>
+    if (isa<DICompileUnit>(CU))<br>
+      if (auto Ts = cast<DICompileUnit>(CU)->getRetainedTypes())<br>
+        for (DIType *Op : Ts)<br>
+          if (auto *T = dyn_cast_or_null<DICompositeType>(Op))<br></blockquote><div><br></div><div>Total aside. I assume something should be checking that there aren't any null entries in the retained types list (or indeed any entries that aren't composite types, either)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+            if (auto *S = T->getRawIdentifier()) {<br>
+              UnresolvedTypeRefs.erase(S);<br>
+              TypeRefs.insert(std::make_pair(S, T));<br>
+            }<br>
<br>
   // Verify debug info intrinsic bit piece expressions.  This needs a second<br>
   // pass through the intructions, since we haven't built TypeRefs yet when<br>
<br>
Added: llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll?rev=265514&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll?rev=265514&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll (added)<br>
+++ llvm/trunk/test/Verifier/dbg-invalid-compileunit.ll Tue Apr  5 22:07:58 2016<br>
@@ -0,0 +1,8 @@<br>
+; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s<br>
+; CHECK:      assembly parsed, but does not verify<br>
+<br>
+!llvm.module.flags = !{!0}<br>
+!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!1}<br>
+<br>
+!0 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!1 = !DIFile(filename: "davide.f", directory: "")<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>