[llvm-commits] [llvm] r47533 - in /llvm/trunk: lib/Bitcode/Reader/BitcodeReader.cpp lib/Bitcode/Writer/BitcodeWriter.cpp test/Assembler/2008-02-20-MultipleReturnValue.ll

[Evan Cheng]

Author: evancheng
Date: Sat Feb 23 13:32:32 2008
New Revision: 47533

URL: http://llvm.org/viewvc/llvm-project?rev=47533&view=rev
Log:
Backing out r47521 for now. This has broken a number of tests.

Modified:
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/test/Assembler/2008-02-20-MultipleReturnValue.ll

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=47533&r1=47532&r2=47533&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Sat Feb 23 13:32:32 2008
@@ -1337,30 +1337,17 @@
     }
     
     case bitc::FUNC_CODE_INST_RET: // RET: [opty,opval<optional>]
-      {
-        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;
-        }
+      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;
       }
     case bitc::FUNC_CODE_INST_BR: { // BR: [bb#, bb#, opval] or [bb#]
       if (Record.size() != 1 && Record.size() != 3)

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=47533&r1=47532&r2=47533&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Sat Feb 23 13:32:32 2008
@@ -747,23 +747,15 @@
   case Instruction::GetResult:
     Code = bitc::FUNC_CODE_INST_GETRESULT;
     PushValueAndType(I.getOperand(0), InstID, Vals, VE);
-    Vals.push_back(cast<GetResultInst>(I).getIndex());
+    Vals.push_back(Log2_32(cast<GetResultInst>(I).getIndex())+1);
     break;
 
-  case Instruction::Ret: 
-    {
-      Code = bitc::FUNC_CODE_INST_RET;
-      unsigned NumOperands = I.getNumOperands();
-      if (NumOperands == 0)
-        AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV;
-      else if (NumOperands == 1) {
-        if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE))
-          AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV;
-      } else {
-        for (unsigned i = 0, e = NumOperands; i != e; ++i)
-          PushValueAndType(I.getOperand(i), InstID, Vals, VE);
-      }
-    }
+  case Instruction::Ret:
+    Code = bitc::FUNC_CODE_INST_RET;
+    if (!I.getNumOperands())
+      AbbrevToUse = FUNCTION_INST_RET_VOID_ABBREV;
+    else if (!PushValueAndType(I.getOperand(0), InstID, Vals, VE))
+      AbbrevToUse = FUNCTION_INST_RET_VAL_ABBREV;
     break;
   case Instruction::Br:
     Code = bitc::FUNC_CODE_INST_BR;

Modified: llvm/trunk/test/Assembler/2008-02-20-MultipleReturnValue.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2008-02-20-MultipleReturnValue.ll?rev=47533&r1=47532&r2=47533&view=diff

==============================================================================
--- llvm/trunk/test/Assembler/2008-02-20-MultipleReturnValue.ll (original)
+++ llvm/trunk/test/Assembler/2008-02-20-MultipleReturnValue.ll Sat Feb 23 13:32:32 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -verify | llvm-dis | llvm-as -disable-output
+; RUN: llvm-as < %s -disable-output
 
 define {i32, i8} @foo(i32 %p) {
   ret i32 1, i8 2