[llvm] r337053 - [LTO] Fix linking with an alias defined using another alias.

Eli Friedman via llvm-commits llvm-commits at lists.llvm.org
Fri Jul 13 14:58:55 PDT 2018


Author: efriedma
Date: Fri Jul 13 14:58:55 2018
New Revision: 337053

URL: http://llvm.org/viewvc/llvm-project?rev=337053&view=rev
Log:
[LTO] Fix linking with an alias defined using another alias.

When we're linking an alias which will be defined later, we neeed to
build a GlobalAlias, or else we'll crash later in
IRLinker::linkGlobalValueBody.

clang sometimes constructs aliases like this for C++ destructors.

Differential Revision: https://reviews.llvm.org/D49316


Added:
    llvm/trunk/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
    llvm/trunk/test/LTO/Resolution/X86/alias-alias.ll
Modified:
    llvm/trunk/lib/Linker/IRMover.cpp

Modified: llvm/trunk/lib/Linker/IRMover.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/IRMover.cpp?rev=337053&r1=337052&r2=337053&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/IRMover.cpp (original)
+++ llvm/trunk/lib/Linker/IRMover.cpp Fri Jul 13 14:58:55 2018
@@ -948,7 +948,7 @@ Expected<Constant *> IRLinker::linkGloba
     if (DoneLinkingBodies)
       return nullptr;
 
-    NewGV = copyGlobalValueProto(SGV, ShouldLink);
+    NewGV = copyGlobalValueProto(SGV, ShouldLink || ForAlias);
     if (ShouldLink || !ForAlias)
       forceRenaming(NewGV, SGV->getName());
   }

Added: llvm/trunk/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll?rev=337053&view=auto
==============================================================================
--- llvm/trunk/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll (added)
+++ llvm/trunk/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll Fri Jul 13 14:58:55 2018
@@ -0,0 +1,5 @@
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+ at a = external global i32
+ at d = global i32* @a

Added: llvm/trunk/test/LTO/Resolution/X86/alias-alias.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/Resolution/X86/alias-alias.ll?rev=337053&view=auto
==============================================================================
--- llvm/trunk/test/LTO/Resolution/X86/alias-alias.ll (added)
+++ llvm/trunk/test/LTO/Resolution/X86/alias-alias.ll Fri Jul 13 14:58:55 2018
@@ -0,0 +1,27 @@
+; RUN: llvm-as %s -o %t1.o
+; RUN: llvm-as %p/Inputs/alias-alias-1.ll -o %t2.o
+; RUN: llvm-lto2 run -o %t3.o %t1.o %t2.o -r %t2.o,a, -r %t2.o,d,px -r %t1.o,a,p -r %t1.o,c,p -r %t1.o,b -save-temps
+; RUN: llvm-dis < %t3.o.0.0.preopt.bc -o - | FileCheck %s
+; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt
+
+; CHECK-NOT: alias
+; CHECK: @c = global i32 1
+; CHECK-NEXT: @d = global i32* @a
+; CHECK-EMPTY:
+; CHECK-NEXT: @a = weak alias i32, i32* @b
+; CHECK-NEXT: @b = internal alias i32, i32* @c
+
+; RES: 1.o{{$}}
+; RES-NEXT: {{^}}-r={{.*}}1.o,c,p{{$}}
+; RES-NEXT: {{^}}-r={{.*}}1.o,a,p{{$}}
+; RES-NEXT: {{^}}-r={{.*}}1.o,b,{{$}}
+; RES-NEXT: 2.o{{$}}
+; RES-NEXT: {{^}}-r={{.*}}2.o,a,{{$}}
+; RES-NEXT: {{^}}-r={{.*}}2.o,d,px{{$}}
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+ at a = weak alias i32, i32* @b
+ at b = alias i32, i32* @c
+ at c = global i32 1




More information about the llvm-commits mailing list