1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Transforms/NaCl/ExpandI64.cpp b/lib/Transforms/NaCl/ExpandI64.cpp
index 6c00900fb8..d575d1943a 100644
--- a/lib/Transforms/NaCl/ExpandI64.cpp
+++ b/lib/Transforms/NaCl/ExpandI64.cpp
@@ -610,6 +610,10 @@ void ExpandI64::finalizeInst(Instruction *I) {
           j++;
         }
       }
+      if (!isIllegal(I->getType())) {
+        // legal return value, so just replace the old call with the new call
+        I->replaceAllUsesWith(L);
+      }
       break;
     }
     default: dumpIR(I); assert(0);