From: Gerolf Hoflehner Date: Thu, 17 Apr 2014 19:14:06 +0000 (+0000) Subject: Reverse 206485. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d5e9413512a841b2a6cddd19ce1cccf2ff767054;p=oota-llvm.git Reverse 206485. After some discussions the preferred semantics of the always_inline attribute is inline always when the compiler can determine that it it safe to do so. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206487 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Analysis/IPA/InlineCost.cpp b/lib/Analysis/IPA/InlineCost.cpp index 683637f5b7f..a803f8c3bf9 100644 --- a/lib/Analysis/IPA/InlineCost.cpp +++ b/lib/Analysis/IPA/InlineCost.cpp @@ -1300,14 +1300,8 @@ bool InlineCostAnalysis::isInlineViable(Function &F) { F.getAttributes().hasAttribute(AttributeSet::FunctionIndex, Attribute::ReturnsTwice); for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; ++BI) { - // Disallow inlining of functions which contain an indirect branch, - // unless the always_inline attribute is set. - // The attribute serves as a assertion that no local address - // like a block label can escpape the function. - // Revisit enabling inlining for functions with indirect branches - // when a more sophisticated espape/points-to analysis becomes available. - if (isa(BI->getTerminator()) && - !F.hasFnAttribute(Attribute::AlwaysInline)) + // Disallow inlining of functions which contain an indirect branch. + if (isa(BI->getTerminator())) return false; for (BasicBlock::iterator II = BI->begin(), IE = BI->end(); II != IE; diff --git a/test/Transforms/Inline/always-inline-attribute.ll b/test/Transforms/Inline/always-inline-attribute.ll deleted file mode 100644 index c146122e163..00000000000 --- a/test/Transforms/Inline/always-inline-attribute.ll +++ /dev/null @@ -1,26 +0,0 @@ -; RUN: opt < %s -O3 -S | FileCheck %s -@gv = external global i32 - -define i32 @main() nounwind { -; CHECK-NOT: call i32 @foo - %1 = load i32* @gv, align 4 - %2 = tail call i32 @foo(i32 %1) - unreachable -} - -define internal i32 @foo(i32) alwaysinline { - br label %2 - -;