[llvm] r267437 - [gold] Fix linkInModule and extend common.ll test.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Mon Apr 25 13:23:29 2016
New Revision: 267437

URL: http://llvm.org/viewvc/llvm-project?rev=267437&view=rev
Log:
[gold] Fix linkInModule and extend common.ll test.

Fix early exit from linkInModule. IRMover::move returns false on
success and true on error.

Add a few more cases of merged common linkage variables with
different sizes and alignments.

Added:
    llvm/trunk/test/tools/gold/X86/Inputs/common2.ll
    llvm/trunk/test/tools/gold/X86/Inputs/common3.ll
Modified:
    llvm/trunk/test/tools/gold/X86/Inputs/common.ll
    llvm/trunk/test/tools/gold/X86/common.ll
    llvm/trunk/tools/gold/gold-plugin.cpp

Modified: llvm/trunk/test/tools/gold/X86/Inputs/common.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/Inputs/common.ll?rev=267437&r1=267436&r2=267437&view=diff
==============================================================================
--- llvm/trunk/test/tools/gold/X86/Inputs/common.ll (original)
+++ llvm/trunk/test/tools/gold/X86/Inputs/common.ll Mon Apr 25 13:23:29 2016
@@ -1 +1 @@
- at a = common global i16 0, align 4
+ at a = common global i32 0, align 4

Added: llvm/trunk/test/tools/gold/X86/Inputs/common2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/Inputs/common2.ll?rev=267437&view=auto
==============================================================================
--- llvm/trunk/test/tools/gold/X86/Inputs/common2.ll (added)
+++ llvm/trunk/test/tools/gold/X86/Inputs/common2.ll Mon Apr 25 13:23:29 2016
@@ -0,0 +1 @@
+ at a = common global i8 0, align 16

Added: llvm/trunk/test/tools/gold/X86/Inputs/common3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/Inputs/common3.ll?rev=267437&view=auto
==============================================================================
--- llvm/trunk/test/tools/gold/X86/Inputs/common3.ll (added)
+++ llvm/trunk/test/tools/gold/X86/Inputs/common3.ll Mon Apr 25 13:23:29 2016
@@ -0,0 +1 @@
+ at a = common global i8 0, align 1

Modified: llvm/trunk/test/tools/gold/X86/common.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/common.ll?rev=267437&r1=267436&r2=267437&view=diff
==============================================================================
--- llvm/trunk/test/tools/gold/X86/common.ll (original)
+++ llvm/trunk/test/tools/gold/X86/common.ll Mon Apr 25 13:23:29 2016
@@ -1,15 +1,33 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-as %p/Inputs/common.ll -o %t2.o
+; RUN: llvm-as %p/Inputs/common2.ll -o %t2b.o
+; RUN: llvm-as %p/Inputs/common3.ll -o %t2c.o
+
+ at a = common global i16 0, align 8
 
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o %t2.o -o %t3.o
-; RUN: llvm-dis %t3.o -o - | FileCheck %s
-
- at a = common global i8 0, align 8
+; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=A
 
 ; Shared library case, we merge @a as common and keep it for the symbol table.
-; CHECK: @a = common global i16 0, align 8
+; A: @a = common global i32 0, align 8
+
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN:    --plugin-opt=emit-llvm \
+; RUN:    -shared %t1.o %t2b.o -o %t3.o
+; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=B
+
+; (i16 align 8) + (i8 align 16) = i16 align 16
+; B: @a = common global i16 0, align 16
+
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN:    --plugin-opt=emit-llvm \
+; RUN:    -shared %t1.o %t2c.o -o %t3.o
+; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=C
+
+; (i16 align 8) + (i8 align 1) = i16 align 8.
+; C: @a = common global i16 0, align 8
 
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
 ; RUN:    --plugin-opt=emit-llvm \
@@ -17,13 +35,13 @@
 ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=EXEC %s
 
 ; All IR case, we internalize a after merging.
-; EXEC: @a = internal global i16 0, align 8
+; EXEC: @a = internal global i32 0, align 8
 
-; RUN: llc %p/Inputs/common.ll -o %t2.o -filetype=obj
+; RUN: llc %p/Inputs/common.ll -o %t2native.o -filetype=obj
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
 ; RUN:    --plugin-opt=emit-llvm \
-; RUN:    %t1.o %t2.o -o %t3.o
+; RUN:    %t1.o %t2native.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=MIXED %s
 
 ; Mixed ELF and IR. We keep ours as common so the linker will finish the merge.
-; MIXED: @a = common global i8 0, align 8
+; MIXED: @a = common global i16 0, align 8

Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=267437&r1=267436&r2=267437&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Mon Apr 25 13:23:29 2016
@@ -1090,8 +1090,8 @@ static bool linkInModule(LLVMContext &Co
     M->setTargetTriple(DefaultTriple);
   }
 
-  if (!L.move(std::move(M), Keep, [](GlobalValue &, IRMover::ValueAdder) {}))
-    return false;
+  if (L.move(std::move(M), Keep, [](GlobalValue &, IRMover::ValueAdder) {}))
+    return true;
 
   for (const auto &I : Realign) {
     GlobalValue *Dst = L.getModule().getNamedValue(I.first());
@@ -1100,7 +1100,7 @@ static bool linkInModule(LLVMContext &Co
     cast<GlobalVariable>(Dst)->setAlignment(I.second);
   }
 
-  return true;
+  return false;
 }
 
 /// Perform the ThinLTO backend on a single module, invoking the LTO and codegen