Handle multiple return values.

llvm-svn: 47904

2 files changed, 41 insertions, 3 deletions

diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp
index 552583042a7..6dda6d3313a 100644
--- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
+++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -442,9 +442,21 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) {
 
     // If the return instruction returned a value, replace uses of the call with
     // uses of the returned value.
-    if (!TheCall->use_empty())
-      TheCall->replaceAllUsesWith(Returns[0]->getReturnValue());
-
+    if (!TheCall->use_empty()) {
+      ReturnInst *R = Returns[0];
+      if (R->getNumOperands() > 1) {
+        // Multiple return values.
+        for (Value::use_iterator RUI = TheCall->use_begin(),
+               RUE = TheCall->use_end(); RUI != RUE; ) {
+          GetResultInst *GR = dyn_cast<GetResultInst>(RUI++);
+          assert (GR && "Invalid Call instruction use!");
+          Value *RV = R->getOperand(GR->getIndex());
+          GR->replaceAllUsesWith(RV);
+          GR->eraseFromParent();
+        }
+      } else
+        TheCall->replaceAllUsesWith(R->getReturnValue());
+    }
     // Since we are now done with the Call/Invoke, we can delete it.
     TheCall->getParent()->getInstList().erase(TheCall);
 
diff --git a/llvm/test/Transforms/Inline/2008-03-04-StructRet.ll b/llvm/test/Transforms/Inline/2008-03-04-StructRet.ll
new file mode 100644
index 00000000000..d919cf49fd3
--- /dev/null
+++ b/llvm/test/Transforms/Inline/2008-03-04-StructRet.ll
@@ -0,0 +1,26 @@
+; RUN: llvm-as < %s | opt -inline -sretpromotion -disable-output
+	%struct.Benchmark = type { i32 (...)** }
+	%struct.Complex = type { double, double }
+	%struct.ComplexBenchmark = type { %struct.Benchmark }
+
+define void @_Zml7ComplexS_(%struct.Complex* sret  %agg.result, double %a.0, double %a.1, double %b.0, double %b.1) nounwind  {
+entry:
+	ret void
+}
+
+define void @_ZNK16ComplexBenchmark9oop_styleEv(%struct.ComplexBenchmark* %this) nounwind  {
+entry:
+	%tmp = alloca %struct.Complex		; <%struct.Complex*> [#uses=2]
+	br label %bb31
+
+bb:		; preds = %bb31
+	call void @_Zml7ComplexS_( %struct.Complex* sret  %tmp, double 0.000000e+00, double 0.000000e+00, double 0.000000e+00, double 0.000000e+00 ) nounwind 
+	%tmp21 = getelementptr %struct.Complex* %tmp, i32 0, i32 1		; <double*> [#uses=0]
+	br label %bb31
+
+bb31:		; preds = %bb, %entry
+	br i1 false, label %bb, label %return
+
+return:		; preds = %bb31
+	ret void
+}