diff --git a/llvm/lib/VMCore/AutoUpgrade.cpp b/llvm/lib/VMCore/AutoUpgrade.cpp
index c2c19c45e4c2..fd7d6dcd4c2f 100644
--- a/llvm/lib/VMCore/AutoUpgrade.cpp
+++ b/llvm/lib/VMCore/AutoUpgrade.cpp
@@ -420,12 +420,15 @@ void llvm::UpgradeCallsToIntrinsic(Function* F) {
 /// function to use aggregate return values built with insertvalue
 /// instructions.
 void llvm::UpgradeMultipleReturnValues(Function *CurrentFunction) {
+  const Type *ReturnType = CurrentFunction->getReturnType();
   for (Function::iterator I = CurrentFunction->begin(),
        E = CurrentFunction->end(); I != E; ++I) {
     BasicBlock *BB = I;
     if (ReturnInst *RI = dyn_cast<ReturnInst>(BB->getTerminator())) {
       unsigned NumVals = RI->getNumOperands();
-      if (NumVals > 1) {
+      if (NumVals > 1 ||
+          (isa<StructType>(ReturnType) &&
+           (NumVals == 0 || RI->getOperand(0)->getType() != ReturnType))) {
         std::vector<const Type *> Types(NumVals);
         for (unsigned i = 0; i != NumVals; ++i)
           Types[i] = RI->getOperand(i)->getType();