1 files changed, 13 insertions, 7 deletions
diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp
index 6f00c89bf5..3253c54a68 100644
--- a/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp
@@ -598,15 +598,21 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
         ++NumRetValsEliminated;
         Changed = true;
       } 
-    if (RetTypes.size() == 0)
-      // No return types? Make it void
-      NRetTy = Type::VoidTy;
+    if (RetTypes.size() > 1 || (STy && STy->getNumElements() == RetTypes.size()))
+      // More than one return type? Return a struct with them. Also, if we used
+      // to return a struct and didn't change the number of return values,
+      // return a struct again. This prevents chaning {something} into something
+      // and {} into void.
+      // Make the new struct packed if we used to return a packed struct
+      // already. 
+      NRetTy = StructType::get(RetTypes, STy->isPacked());
     else if (RetTypes.size() == 1)
-      // One return type? Just a simple value then
+      // One return type? Just a simple value then, but only if we didn't use to
+      // return a struct with that simple value before.
       NRetTy = RetTypes.front();
-    else
-      // More return types? Return a struct with them
-      NRetTy = StructType::get(RetTypes);
+    else if (RetTypes.size() == 0)
+      // No return types? Make it void, but only if we didn't use to return {}
+      NRetTy = Type::VoidTy;
   } else {
     NRetTy = Type::VoidTy;
   }