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

Devang Patel dpatel at apple.com
Mon Feb 25 17:29:33 PST 2008


Author: dpatel
Date: Mon Feb 25 19:29:32 2008
New Revision: 47583

URL: http://llvm.org/viewvc/llvm-project?rev=47583&view=rev
Log:
Update bitcode reader and writer to handle multiple return values. 
Take 2.

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=47583&r1=47582&r2=47583&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Mon Feb 25 19:29:32 2008
@@ -1337,17 +1337,24 @@
     }
     
     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 {
+          unsigned OpNum = 0;
+          std::vector<Value *> Vs;
+          do {
+            Value *Op = NULL;
+            if (getValueTypePair(Record, OpNum, NextValueNo, Op))
+              return Error("Invalid RET record");
+            Vs.push_back(Op);
+          } while(OpNum != Record.size());
+
+          I = new ReturnInst(Vs);
+          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=47583&r1=47582&r2=47583&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Mon Feb 25 19:29:32 2008
@@ -747,15 +747,24 @@
   case Instruction::GetResult:
     Code = bitc::FUNC_CODE_INST_GETRESULT;
     PushValueAndType(I.getOperand(0), InstID, Vals, VE);
-    Vals.push_back(Log2_32(cast<GetResultInst>(I).getIndex())+1);
+    Vals.push_back(cast<GetResultInst>(I).getIndex());
     break;
 
-  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;
+  case Instruction::Ret: 
+    {
+      Code = bitc::FUNC_CODE_INST_RET;
+      unsigned NumOperands = I.getNumOperands();
+      //      printf ("dpatel write %d\n", NumOperands);
+      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);
+      }
+    }
     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=47583&r1=47582&r2=47583&view=diff

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





More information about the llvm-commits mailing list