[PATCH] D23632: [LTO] Promote before performing weak resolution

[Mehdi AMINI via llvm-commits]

mehdi_amini created this revision.
mehdi_amini added a reviewer: tejohnson.
mehdi_amini added subscribers: llvm-commits, pcc.
Herald added a subscriber: mehdi_amini.

This was reversed compared to ThinLTOCodeGenerator for some reason,
and lead to an increased code-size on my tests. I figured that the
weak resolution may internalize a linkonce function, which will be
promoted immediately (and renamed), before being internalized again.

https://reviews.llvm.org/D23632

Files:
  lib/LTO/LTOBackend.cpp
  test/ThinLTO/X86/internalize.ll

Index: test/ThinLTO/X86/internalize.ll
===================================================================
--- test/ThinLTO/X86/internalize.ll
+++ test/ThinLTO/X86/internalize.ll
@@ -3,17 +3,30 @@
 ; RUN: llvm-lto -thinlto-action=internalize -thinlto-index %t.index.bc %t1.bc -o - | llvm-dis -o - | FileCheck %s --check-prefix=REGULAR
 ; RUN: llvm-lto -thinlto-action=internalize -thinlto-index %t.index.bc %t1.bc -o -  --exported-symbol=foo | llvm-dis -o - | FileCheck %s --check-prefix=INTERNALIZE
 
+; RUN: llvm-lto2 %t1.bc -o %t.o -save-temps \
+; RUN:     -r=%t1.bc,_foo,pxl \
+; RUN:     -r=%t1.bc,_bar,pl \
+; RUN:     -r=%t1.bc,_linkonce_func,pl
+; RUN: llvm-dis < %t.o.0.2.internalized.bc | FileCheck  %s --check-prefix=INTERNALIZE
+
+
 ; REGULAR: define void @foo
 ; REGULAR: define void @bar
+; REGULAR: define linkonce void @linkonce_func()
 ; INTERNALIZE: define void @foo
 ; INTERNALIZE: define internal void @bar
+; INTERNALIZE: define internal void @linkonce_func()
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"
 
 define void @foo() {
     ret void
 }
 define void @bar() {
+    call void @linkonce_func()
+	ret void
+}
+define linkonce void @linkonce_func() {
     ret void
 }
\ No newline at end of file
Index: lib/LTO/LTOBackend.cpp
===================================================================
--- lib/LTO/LTOBackend.cpp
+++ lib/LTO/LTOBackend.cpp
@@ -256,10 +256,10 @@
   if (Conf.PreOptModuleHook && !Conf.PreOptModuleHook(Task, Mod))
     return Error();
 
-  thinLTOResolveWeakForLinkerModule(Mod, DefinedGlobals);
-
   renameModuleForThinLTO(Mod, CombinedIndex);
 
+  thinLTOResolveWeakForLinkerModule(Mod, DefinedGlobals);
+
   if (Conf.PostPromoteModuleHook && !Conf.PostPromoteModuleHook(Task, Mod))
     return Error();
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23632.68439.patch
Type: text/x-patch
Size: 1821 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160817/95861f30/attachment.bin>