[llvm-commits] [llvm] r51992 - in /llvm/trunk: lib/Transforms/IPO/StructRetPromotion.cpp test/Transforms/SRETPromotion/2008-06-05-non-call-use.ll

[Matthijs Kooijman]

Author: matthijs
Date: Thu Jun  5 03:57:20 2008
New Revision: 51992

URL: http://llvm.org/viewvc/llvm-project?rev=51992&view=rev
Log:
Let StructRetPromotion check if all if its users are really calls or invokesn,
not other instructions. This fixes a crash with the added testcase.

Added:
    llvm/trunk/test/Transforms/SRETPromotion/2008-06-05-non-call-use.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=51992&r1=51991&r2=51992&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Thu Jun  5 03:57:20 2008
@@ -165,6 +165,10 @@
 
     CallSite CS = CallSite::get(*FnUseI);
     Instruction *Call = CS.getInstruction();
+    // The function is used by something else than a call or invoke instruction,
+    // we can't change it!
+    if (!Call)
+      return false;
     CallSite::arg_iterator AI = CS.arg_begin();
     Value *FirstArg = *AI;
 

Added: llvm/trunk/test/Transforms/SRETPromotion/2008-06-05-non-call-use.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SRETPromotion/2008-06-05-non-call-use.ll?rev=51992&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/SRETPromotion/2008-06-05-non-call-use.ll (added)
+++ llvm/trunk/test/Transforms/SRETPromotion/2008-06-05-non-call-use.ll Thu Jun  5 03:57:20 2008
@@ -0,0 +1,20 @@
+; This test shows an sret function that is used as an operand to a bitcast.
+; StructRetPromotion used to assume that a function was only used by call or
+; invoke instructions, making this code cause an assertion failure.
+
+; 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:
+        %bar = bitcast void (%struct.S*)* @foo to i32 ()*
+	ret i32 undef
+}
+
+define internal void @foo(%struct.S* sret) {
+entry:
+	ret void
+}