[PATCH] D20704: Update LLD for D20550.

[Peter Collingbourne via llvm-commits]

pcc created this revision.
pcc added a reviewer: rafael.
pcc added a subscriber: llvm-commits.
Herald added a subscriber: mehdi_amini.

http://reviews.llvm.org/D20704

Files:
  ELF/LTO.cpp
  test/ELF/lto/Inputs/irmover-error.ll
  test/ELF/lto/irmover-error.ll

Index: test/ELF/lto/irmover-error.ll
===================================================================
--- /dev/null
+++ test/ELF/lto/irmover-error.ll
@@ -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 }
Index: test/ELF/lto/Inputs/irmover-error.ll
===================================================================
--- /dev/null
+++ test/ELF/lto/Inputs/irmover-error.ll
@@ -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 }
Index: ELF/LTO.cpp
===================================================================
--- ELF/LTO.cpp
+++ ELF/LTO.cpp
@@ -218,8 +218,13 @@
     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());
+      return Error::success();
+    });
+  }
 }
 
 static void internalize(GlobalValue &GV) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20704.58705.patch
Type: text/x-patch
Size: 1595 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160526/5084bfd8/attachment.bin>