From bdcf8debc408a835d7844328991fb79636f50a74 Mon Sep 17 00:00:00 2001 From: Eugene Leviant Date: Mon, 25 Dec 2017 13:57:24 +0000 Subject: [PATCH] [ThinLTO] Don't import functions with noinline attribute Differential revision: https://reviews.llvm.org/D41489 llvm-svn: 321443 --- lib/Analysis/ModuleSummaryAnalysis.cpp | 4 +++- test/ThinLTO/X86/Inputs/noinline.ll | 8 ++++++++ test/ThinLTO/X86/noinline.ll | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 test/ThinLTO/X86/Inputs/noinline.ll create mode 100644 test/ThinLTO/X86/noinline.ll diff --git a/lib/Analysis/ModuleSummaryAnalysis.cpp b/lib/Analysis/ModuleSummaryAnalysis.cpp index 10badd89a4a..efa5bd564ad 100644 --- a/lib/Analysis/ModuleSummaryAnalysis.cpp +++ b/lib/Analysis/ModuleSummaryAnalysis.cpp @@ -306,7 +306,9 @@ computeFunctionSummary(ModuleSummaryIndex &Index, const Module &M, NonRenamableLocal || HasInlineAsmMaybeReferencingInternal || // Inliner doesn't handle variadic functions. // FIXME: refactor this to use the same code that inliner is using. - F.isVarArg(); + F.isVarArg() || + // Don't try to import functions with noinline attribute. + F.getAttributes().hasFnAttribute(Attribute::NoInline); GlobalValueSummary::GVFlags Flags(F.getLinkage(), NotEligibleForImport, /* Live = */ false, F.isDSOLocal()); FunctionSummary::FFlags FunFlags{ diff --git a/test/ThinLTO/X86/Inputs/noinline.ll b/test/ThinLTO/X86/Inputs/noinline.ll new file mode 100644 index 00000000000..73db2912cab --- /dev/null +++ b/test/ThinLTO/X86/Inputs/noinline.ll @@ -0,0 +1,8 @@ +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-linux-gnu" + +define i32 @foo(i32) local_unnamed_addr #0 { + ret i32 10 +} + +attributes #0 = { noinline } diff --git a/test/ThinLTO/X86/noinline.ll b/test/ThinLTO/X86/noinline.ll new file mode 100644 index 00000000000..27f59ab9096 --- /dev/null +++ b/test/ThinLTO/X86/noinline.ll @@ -0,0 +1,26 @@ +; This test checks that ThinLTO doesn't try to import noinline function +; which, when takes place, causes promotion of its callee. +; RUN: opt -module-summary %s -o %t1.bc +; RUN: opt -module-summary %p/Inputs/noinline.ll -o %t2.bc +; RUN: llvm-lto2 run %t1.bc %t2.bc -o %t3.o \ +; RUN: -save-temps \ +; RUN: -r=%t1.bc,main,px \ +; RUN: -r=%t1.bc,foo, \ +; RUN: -r=%t2.bc,foo,p + +; RUN: llvm-dis %t3.o.1.3.import.bc -o - | FileCheck %s + +; CHECK-NOT: define available_externally i32 @foo + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-linux-gnu" + +; Function Attrs: nounwind ssp uwtable +define i32 @main(i32, i8** nocapture readnone) local_unnamed_addr #0 { + %3 = tail call i32 @foo(i32 %0) #0 + ret i32 %3 +} + +declare i32 @foo(i32) local_unnamed_addr + +attributes #0 = { nounwind }