Properly read and write bitcodes for multiple return values.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47521 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 24 insertions, 11 deletions

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index ebfca09c49..a82892063b 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1337,17 +1337,30 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
     }
     
     case bitc::FUNC_CODE_INST_RET: // RET: [opty,opval<optional>]
-      if (Record.empty()) {
-        I = new ReturnInst();
-        break;
-      } else {
-        unsigned OpNum = 0;
-        Value *Op;
-        if (getValueTypePair(Record, OpNum, NextValueNo, Op) ||
-            OpNum != Record.size())
-          return Error("Invalid RET record");
-        I = new ReturnInst(Op);
-        break;
+      {
+        unsigned Size = Record.size();
+        if (Size == 0) {
+          I = new ReturnInst();
+          break;
+        } else if (Size == 1) {
+          unsigned OpNum = 0;
+          Value *Op;
+          if (getValueTypePair(Record, OpNum, NextValueNo, Op) ||
+              OpNum != Record.size())
+            return Error("Invalid RET record");
+          I = new ReturnInst(Op);
+          break;
+        } else {
+          std::vector<Value *> Vs;
+          Value *Op;
+          unsigned OpNum = 0;
+          for (unsigned i = 0; i < Size; ++i) {
+            getValueTypePair(Record, OpNum, NextValueNo, Op);
+            Vs.push_back(Op);
+          }
+          I = new ReturnInst(Vs);
+          break;
+        }
       }
     case bitc::FUNC_CODE_INST_BR: { // BR: [bb#, bb#, opval] or [bb#]
       if (Record.size() != 1 && Record.size() != 3)