<div dir="ltr">I think that is a mistake, so I fixed it in r265316.</div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Apr 3, 2016 at 10:54 AM, Rui Ueyama <span dir="ltr"><<a href="mailto:ruiu@google.com" target="_blank">ruiu@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5">On Sat, Apr 2, 2016 at 8:39 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: Sat Apr  2 22:39:09 2016<br>
New Revision: 265258<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=265258&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=265258&view=rev</a><br>
Log:<br>
[LTO] Implement -disable-verify, which disables bitcode verification.<br>
<br>
So, there are some cases when the IR Linker produces a broken<br>
module (which doesn't pass the verifier) and we end up asserting<br>
inside the verifier. I think it's always a bug producing a module<br>
which does not pass the verifier but there are some cases in which<br>
people can live with the broken module (e.g. if only DebugInfo<br>
metadata are broken). The gold plugin has something similar.<br>
<br>
This commit is motivated by a situation I found in the<br>
wild. It seems that somebody else discovered it independently<br>
and reported in PR24923.<br>
<br>
Added:<br>
    lld/trunk/test/ELF/lto/verify-invalid.ll<br>
Modified:<br>
    lld/trunk/ELF/Config.h<br>
    lld/trunk/ELF/Driver.cpp<br>
    lld/trunk/ELF/LTO.cpp<br>
    lld/trunk/ELF/Options.td<br>
<br>
Modified: lld/trunk/ELF/Config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=265258&r1=265257&r2=265258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=265258&r1=265257&r2=265258&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Config.h (original)<br>
+++ lld/trunk/ELF/Config.h Sat Apr  2 22:39:09 2016<br>
@@ -56,6 +56,7 @@ struct Configuration {<br>
   bool BsymbolicFunctions;<br>
   bool BuildId;<br>
   bool Demangle = true;<br>
+  bool DisableVerify;<br>
   bool DiscardAll;<br>
   bool DiscardLocals;<br>
   bool DiscardNone;<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=265258&r1=265257&r2=265258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=265258&r1=265257&r2=265258&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Sat Apr  2 22:39:09 2016<br>
@@ -270,6 +270,7 @@ void LinkerDriver::readConfigs(opt::Inpu<br>
   Config->BsymbolicFunctions = Args.hasArg(OPT_Bsymbolic_functions);<br>
   Config->BuildId = Args.hasArg(OPT_build_id);<br>
   Config->Demangle = !Args.hasArg(OPT_no_demangle);<br>
+  Config->DisableVerify = Args.hasArg(OPT_disable_verify);<br>
   Config->DiscardAll = Args.hasArg(OPT_discard_all);<br>
   Config->DiscardLocals = Args.hasArg(OPT_discard_locals);<br>
   Config->DiscardNone = Args.hasArg(OPT_discard_none);<br>
<br>
Modified: lld/trunk/ELF/LTO.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LTO.cpp?rev=265258&r1=265257&r2=265258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LTO.cpp?rev=265258&r1=265257&r2=265258&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/LTO.cpp (original)<br>
+++ lld/trunk/ELF/LTO.cpp Sat Apr  2 22:39:09 2016<br>
@@ -59,8 +59,7 @@ static void runLTOPasses(Module &M, Targ<br>
   PassManagerBuilder PMB;<br>
   PMB.LibraryInfo = new TargetLibraryInfoImpl(Triple(TM.getTargetTriple()));<br>
   PMB.Inliner = createFunctionInliningPass();<br>
-  PMB.VerifyInput = true;<br>
-  PMB.VerifyOutput = true;<br>
+  PMB.VerifyInput = PMB.VerifyOutput = !Config->DisableVerify;<br></blockquote><div><br></div></div></div><div>nit: I'd write it in two lines.</div><span class=""><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
   PMB.LoopVectorize = true;<br>
   PMB.SLPVectorize = true;<br>
   PMB.OptLevel = Config->LtoO;<br>
<br>
Modified: lld/trunk/ELF/Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Options.td?rev=265258&r1=265257&r2=265258&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Options.td?rev=265258&r1=265257&r2=265258&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Options.td (original)<br>
+++ lld/trunk/ELF/Options.td Sat Apr  2 22:39:09 2016<br>
@@ -217,5 +217,6 @@ def G : Separate<["-"], "G">;<br>
 def alias_version_script_version_script : Joined<["--"], "version-script=">, Alias<version_script>;<br>
<br>
 // Debugging/developer options<br>
+def disable_verify : Flag<["-"], "disable-verify">;<br>
 def save_temps : Flag<["-"], "save-temps">;<br>
 def mllvm : Separate<["-"], "mllvm">;<br>
<br>
Added: lld/trunk/test/ELF/lto/verify-invalid.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/verify-invalid.ll?rev=265258&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/verify-invalid.ll?rev=265258&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/lto/verify-invalid.ll (added)<br>
+++ lld/trunk/test/ELF/lto/verify-invalid.ll Sat Apr  2 22:39:09 2016<br>
@@ -0,0 +1,14 @@<br>
+; REQUIRES: x86<br>
+; RUN: llvm-as %s -o %t.o<br>
+; RUN: not ld.lld -m elf_x86_64 %t.o -o %t2 -mllvm  -disable-verify \<br>
+; RUN:   -debug-pass=Arguments 2>&1 | FileCheck %s<br></blockquote><div><br></div></span><div>"-debug-pass=Arguments" is the argument for -mllvm, and -disable-verify is the parameter interpreted by LLD. But -disable-verify is in between -mllvm and its argument. How does it work?</div><span class=""><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+target triple = "x86_64-unknown-linux-gnu"<br>
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"<br>
+<br>
+define void @_start() {<br>
+  ret void<br>
+}<br>
+<br>
+; -disable-verify should disable the verification of bitcode.<br>
+; CHECK-NOT: Pass Arguments: {{.*}} -verify {{.*}} -verify<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></span></div><br></div></div>
</blockquote></div><br></div>