<div dir="ltr">Awesome, fixes the problem for me.  Thank you!!<div><br></div><div>~Will</div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jun 20, 2016 at 9:09 AM Rafael Espindola via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Mon Jun 20 09:02:22 2016<br>
New Revision: 273157<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=273157&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=273157&view=rev</a><br>
Log:<br>
Don't go on an infinite loop on a missing ";".<br>
<br>
Thanks to Will Dietz for reporting the issue.<br>
<br>
Added:<br>
    lld/trunk/test/ELF/Inputs/version-script-err.script<br>
    lld/trunk/test/ELF/version-script-err.s<br>
Modified:<br>
    lld/trunk/ELF/SymbolListFile.cpp<br>
<br>
Modified: lld/trunk/ELF/SymbolListFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolListFile.cpp?rev=273157&r1=273156&r2=273157&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolListFile.cpp?rev=273157&r1=273156&r2=273157&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolListFile.cpp (original)<br>
+++ lld/trunk/ELF/SymbolListFile.cpp Mon Jun 20 09:02:22 2016<br>
@@ -115,7 +115,7 @@ void VersionScriptParser::parseVersionSy<br>
<br>
   for (;;) {<br>
     StringRef Cur = peek();<br>
-    if (Cur == "}" || Cur == "local:")<br>
+    if (Cur == "}" || Cur == "local:" || Error)<br>
       return;<br>
     next();<br>
     Globals->push_back(Cur);<br>
<br>
Added: lld/trunk/test/ELF/Inputs/version-script-err.script<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/version-script-err.script?rev=273157&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/version-script-err.script?rev=273157&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/Inputs/version-script-err.script (added)<br>
+++ lld/trunk/test/ELF/Inputs/version-script-err.script Mon Jun 20 09:02:22 2016<br>
@@ -0,0 +1,4 @@<br>
+{<br>
+  global:<br>
+   foo<br>
+};<br>
<br>
Added: lld/trunk/test/ELF/version-script-err.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-err.s?rev=273157&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/version-script-err.s?rev=273157&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/version-script-err.s (added)<br>
+++ lld/trunk/test/ELF/version-script-err.s Mon Jun 20 09:02:22 2016<br>
@@ -0,0 +1,5 @@<br>
+// REQUIRES: x86<br>
+<br>
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o<br>
+// RUN: not ld.lld -shared %t.o -o %t.so --version-script %p/Inputs/version-script-err.script 2>&1 | FileCheck %s<br>
+// CHECK: ; expected, but got }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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>