[llvm-commits] [llvm] r51991 - in /llvm/trunk: lib/Transforms/IPO/StructRetPromotion.cpp test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll

[Matthijs Kooijman]

Author: matthijs
Date: Thu Jun  5 03:48:32 2008
New Revision: 51991

URL: http://llvm.org/viewvc/llvm-project?rev=51991&view=rev
Log:
Let StructRetPromotion check if it's users are really calling it and not
passing its pointer. Fixes test with added testcase.

Added:
    llvm/trunk/test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp

Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=51991&r1=51990&r2=51991&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Thu Jun  5 03:48:32 2008
@@ -158,6 +158,10 @@
 
   for (Value::use_iterator FnUseI = F->use_begin(), FnUseE = F->use_end();
        FnUseI != FnUseE; ++FnUseI) {
+    // The function is passed in as an argument to (possibly) another function,
+    // we can't change it!
+    if (FnUseI.getOperandNo() != 0)
+      return false;
 
     CallSite CS = CallSite::get(*FnUseI);
     Instruction *Call = CS.getInstruction();

Added: llvm/trunk/test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll?rev=51991&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll (added)
+++ llvm/trunk/test/Transforms/SRETPromotion/2008-06-04-function-pointer-passing.ll Thu Jun  5 03:48:32 2008
@@ -0,0 +1,24 @@
+; This test lures sretpromotion into promoting the sret argument of foo, even
+; when the function is used as an argument to bar. It used to not check for
+; this, assuming that all users of foo were direct calls, resulting in an
+; assertion failure later on.
+
+; We're mainly testing for opt not to crash, but we'll check to see if the sret
+; attribute is still there for good measure.
+; RUN: llvm-as < %s | opt -sretpromotion | llvm-dis | grep sret
+
+%struct.S = type <{ i32, i32 }>
+
+define i32 @main() {
+entry:
+	%tmp = alloca %struct.S		; <%struct.S*> [#uses=1]
+	call void @bar( %struct.S* sret  %tmp, void (%struct.S*, ...)* @foo )
+	ret i32 undef
+}
+
+declare void @bar(%struct.S* sret , void (%struct.S*, ...)*)
+
+define internal void @foo(%struct.S* sret  %agg.result, ...) {
+entry:
+	ret void
+}