[llvm] r206487 - Reverse 206485.

[Gerolf Hoflehner]

Ups, I meant Reverse 206429.

-Gerolf

On Apr 17, 2014, at 12:14 PM, Gerolf Hoflehner <ghoflehner at apple.com> wrote:

> Author: ghoflehner
> Date: Thu Apr 17 14:14:06 2014
> New Revision: 206487
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=206487&view=rev
> Log:
> 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.
> 
> Removed:
>    llvm/trunk/test/Transforms/Inline/always-inline-attribute.ll
> Modified:
>    llvm/trunk/lib/Analysis/IPA/InlineCost.cpp
>    llvm/trunk/test/Transforms/Inline/always-inline.ll
> 
> Modified: llvm/trunk/lib/Analysis/IPA/InlineCost.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/InlineCost.cpp?rev=206487&r1=206486&r2=206487&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Analysis/IPA/InlineCost.cpp (original)
> +++ llvm/trunk/lib/Analysis/IPA/InlineCost.cpp Thu Apr 17 14:14:06 2014
> @@ -1300,14 +1300,8 @@ bool InlineCostAnalysis::isInlineViable(
>     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<IndirectBrInst>(BI->getTerminator()) &&
> -        !F.hasFnAttribute(Attribute::AlwaysInline))
> +    // Disallow inlining of functions which contain an indirect branch.
> +    if (isa<IndirectBrInst>(BI->getTerminator()))
>       return false;
> 
>     for (BasicBlock::iterator II = BI->begin(), IE = BI->end(); II != IE;
> 
> Removed: llvm/trunk/test/Transforms/Inline/always-inline-attribute.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/always-inline-attribute.ll?rev=206486&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/Inline/always-inline-attribute.ll (original)
> +++ llvm/trunk/test/Transforms/Inline/always-inline-attribute.ll (removed)
> @@ -1,26 +0,0 @@
> -; RUN: opt < %s -O3 -S | FileCheck %s
> - at 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
> -
> -; <label>:2                                       ; preds = %8, %1
> -  %3 = phi i32 [ %0, %1 ], [ %10, %8 ]
> -  %4 = phi i8* [ blockaddress(@foo, %2), %1 ], [ %6, %8 ]
> -  %5 = icmp eq i32 %3, 1
> -  %6 = select i1 %5, i8* blockaddress(@foo, %8), i8* %4
> -  %7 = add nsw i32 %3, -1
> -  br label %8
> -
> -; <label>:8                                       ; preds = %8, %2
> -  %9 = phi i32 [ %7, %2 ], [ %10, %8 ]
> -  %10 = add nsw i32 %9, -1
> -  indirectbr i8* %6, [label %2, label %8]
> -}
> 
> Modified: llvm/trunk/test/Transforms/Inline/always-inline.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/always-inline.ll?rev=206487&r1=206486&r2=206487&view=diff
> ==============================================================================
> --- llvm/trunk/test/Transforms/Inline/always-inline.ll (original)
> +++ llvm/trunk/test/Transforms/Inline/always-inline.ll Thu Apr 17 14:14:06 2014
> @@ -78,7 +78,7 @@ entry:
>   ret i32 %add
> }
> 
> -define i32 @inner5(i8* %addr) {
> +define i32 @inner5(i8* %addr) alwaysinline {
> entry:
>   indirectbr i8* %addr, [ label %one, label %two ]
> 
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits