diff options
-rw-r--r-- | llvm/lib/Transforms/Scalar/SCCP.cpp | 7 | ||||
-rw-r--r-- | llvm/test/Transforms/IPConstantProp/noinline-return.ll | 21 |
2 files changed, 1 insertions, 27 deletions
diff --git a/llvm/lib/Transforms/Scalar/SCCP.cpp b/llvm/lib/Transforms/Scalar/SCCP.cpp index 054ad712d38..dd1123fd4fa 100644 --- a/llvm/lib/Transforms/Scalar/SCCP.cpp +++ b/llvm/lib/Transforms/Scalar/SCCP.cpp @@ -1715,12 +1715,7 @@ static bool runIPSCCP(Module &M, const DataLayout &DL, // Don't touch naked functions. They may contain asm returning a // value we don't see, so we may end up interprocedurally propagating // the return value incorrectly. - // Also, don't touch functions marked as noinline. Trivial functions may - // essentially be inlined because of return value propagation. - // (e.g. int tinkywinky(void) { return 666; }) - if (F.hasExactDefinition() && - !(F.hasFnAttribute(Attribute::Naked) || - F.hasFnAttribute(Attribute::NoInline))) + if (F.hasExactDefinition() && !F.hasFnAttribute(Attribute::Naked)) Solver.AddTrackedFunction(&F); // If this function only has direct calls that we can see, we can track its diff --git a/llvm/test/Transforms/IPConstantProp/noinline-return.ll b/llvm/test/Transforms/IPConstantProp/noinline-return.ll deleted file mode 100644 index 10950327327..00000000000 --- a/llvm/test/Transforms/IPConstantProp/noinline-return.ll +++ /dev/null @@ -1,21 +0,0 @@ -; RUN: opt %s -ipsccp -S | FileCheck %s - -define i32 @tinkywinky() #0 { -entry: - ret i32 5 -} - -define i32 @patatino() { -entry: - %call = call i32 @tinkywinky() - -; Check that we don't propagate the return value of -; @tinkywinky. -; CHECK: call i32 @dipsy(i32 %call) - %call1 = call i32 @dipsy(i32 %call) - ret i32 %call1 -} - -declare i32 @dipsy(i32) - -attributes #0 = { noinline } |