[lld] r270968 - Update LLD for D20550.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Fri May 27 00:21:45 2016
New Revision: 270968

URL: http://llvm.org/viewvc/llvm-project?rev=270968&view=rev
Log:
Update LLD for D20550.

Differential Revision: http://reviews.llvm.org/D20704

Added:
    lld/trunk/test/ELF/lto/Inputs/irmover-error.ll
    lld/trunk/test/ELF/lto/irmover-error.ll
Modified:
    lld/trunk/ELF/LTO.cpp

Modified: lld/trunk/ELF/LTO.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LTO.cpp?rev=270968&r1=270967&r2=270968&view=diff
==============================================================================
--- lld/trunk/ELF/LTO.cpp (original)
+++ lld/trunk/ELF/LTO.cpp Fri May 27 00:21:45 2016
@@ -218,8 +218,12 @@ void BitcodeCompiler::add(BitcodeFile &F
     Keep.push_back(GV);
   }
 
-  Mover.move(Obj->takeModule(), Keep,
-             [](GlobalValue &, IRMover::ValueAdder) {});
+  if (Error E = Mover.move(Obj->takeModule(), Keep,
+                           [](GlobalValue &, IRMover::ValueAdder) {})) {
+    handleAllErrors(std::move(E), [&](const llvm::ErrorInfoBase &EIB) {
+      fatal("failed to link module " + F.getName() + ": " + EIB.message());
+    });
+  }
 }
 
 static void internalize(GlobalValue &GV) {

Added: lld/trunk/test/ELF/lto/Inputs/irmover-error.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/Inputs/irmover-error.ll?rev=270968&view=auto
==============================================================================
--- lld/trunk/test/ELF/lto/Inputs/irmover-error.ll (added)
+++ lld/trunk/test/ELF/lto/Inputs/irmover-error.ll Fri May 27 00:21:45 2016
@@ -0,0 +1,6 @@
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+!0 = !{ i32 1, !"foo", i32 2 }
+
+!llvm.module.flags = !{ !0 }

Added: lld/trunk/test/ELF/lto/irmover-error.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/irmover-error.ll?rev=270968&view=auto
==============================================================================
--- lld/trunk/test/ELF/lto/irmover-error.ll (added)
+++ lld/trunk/test/ELF/lto/irmover-error.ll Fri May 27 00:21:45 2016
@@ -0,0 +1,12 @@
+; RUN: llvm-as -o %t1.bc %s
+; RUN: llvm-as -o %t2.bc %S/Inputs/irmover-error.ll
+; RUN: not ld.lld -m elf_x86_64 %t1.bc %t2.bc -o %t 2>&1 | FileCheck %s
+
+; CHECK: failed to link module {{.*}}2.bc: linking module flags 'foo': IDs have conflicting values
+
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+!0 = !{ i32 1, !"foo", i32 1 }
+
+!llvm.module.flags = !{ !0 }