[llvm-commits] [llvm] r105255 - in /llvm/trunk: lib/Transforms/Utils/InlineFunction.cpp test/Transforms/Inline/2010-05-31-ByvalTailcall.ll

[Duncan Sands]

Author: baldrick
Date: Mon May 31 16:00:26 2010
New Revision: 105255

URL: http://llvm.org/viewvc/llvm-project?rev=105255&view=rev
Log:
Fix PR7272: when inlining through a callsite with byval arguments,
the newly created allocas may be used by inlined calls, so these
need to have their tail call flags cleared.  Fixes PR7272.

Added:
    llvm/trunk/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll
Modified:
    llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp

Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=105255&r1=105254&r2=105255&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Mon May 31 16:00:26 2010
@@ -351,6 +351,10 @@
         // Uses of the argument in the function should use our new alloca
         // instead.
         ActualArg = NewAlloca;
+
+        // Calls that we inline may use the new alloca, so we need to clear
+        // their 'tail' flags.
+        MustClearTailCallFlags = true;
       }
 
       ValueMap[I] = ActualArg;

Added: llvm/trunk/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll?rev=105255&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll (added)
+++ llvm/trunk/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll Mon May 31 16:00:26 2010
@@ -0,0 +1,24 @@
+; RUN: opt < %s -tailcallelim -inline -instcombine -dse -S | FileCheck %s
+; PR7272
+
+; When inlining through a byval call site, the inliner creates allocas which may
+; be used by inlined calls, so any inlined calls need to have their 'tail' flags
+; cleared.  If not then you can get nastiness like with this testcase, where the
+; (inlined) call to 'ext' in 'foo' was being passed an uninitialized value.
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
+target triple = "i386-pc-linux-gnu"
+
+declare void @ext(i32*)
+
+define void @bar(i32* byval %x) {
+  call void @ext(i32* %x)
+  ret void
+}
+
+define void @foo(i32* %x) {
+; CHECK: define void @foo
+; CHECK: store i32 %1, i32* %x
+  call void @bar(i32* byval %x)
+  ret void
+}