[llvm-commits] [llvm] r47633 - in /llvm/trunk: include/llvm/Instructions.h lib/AsmParser/llvmAsmParser.y lib/VMCore/Instructions.cpp

[Devang Patel]

Author: dpatel
Date: Tue Feb 26 16:12:58 2008
New Revision: 47633

URL: http://llvm.org/viewvc/llvm-project?rev=47633&view=rev
Log:
Remove unncessary ReturnInst constructors.

Modified:
    llvm/trunk/include/llvm/Instructions.h
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/VMCore/Instructions.cpp

Modified: llvm/trunk/include/llvm/Instructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=47633&r1=47632&r2=47633&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Tue Feb 26 16:12:58 2008
@@ -1397,9 +1397,6 @@
   // if it was passed NULL.
   explicit ReturnInst(Value *retVal = 0, Instruction *InsertBefore = 0);
   ReturnInst(Value *retVal, BasicBlock *InsertAtEnd);
-  ReturnInst(const std::vector<Value *> &retVals);
-  ReturnInst(const std::vector<Value *> &retVals, Instruction *InsertBefore);
-  ReturnInst(const std::vector<Value *> &retVals, BasicBlock *InsertAtEnd);
   ReturnInst(Value * const* retVals, unsigned N);
   ReturnInst(Value * const* retVals, unsigned N, Instruction *InsertBefore);
   ReturnInst(Value * const* retVals, unsigned N, BasicBlock *InsertAtEnd);

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=47633&r1=47632&r2=47633&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Feb 26 16:12:58 2008
@@ -2580,7 +2580,9 @@
 
 BBTerminatorInst : 
   RET ReturnedVal  { // Return with a result...
-    $$ = new ReturnInst(*$2);
+    ValueList &VL = *$2;
+    if (!VL.empty())
+      $$ = new ReturnInst(&VL[0], VL.size());
     delete $2;
     CHECK_FOR_ERROR
   }

Modified: llvm/trunk/lib/VMCore/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=47633&r1=47632&r2=47633&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Feb 26 16:12:58 2008
@@ -598,26 +598,6 @@
   : TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, 0, InsertAtEnd) {
 }
 
-ReturnInst::ReturnInst(const std::vector<Value *> &retVals, 
-                       Instruction *InsertBefore)
-  : TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, retVals.size(), 
-                   InsertBefore) {
-  if (!retVals.empty())
-    init(&retVals[0], retVals.size());
-}
-ReturnInst::ReturnInst(const std::vector<Value *> &retVals, 
-                       BasicBlock *InsertAtEnd)
-  : TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, retVals.size(), 
-                   InsertAtEnd) {
-  if (!retVals.empty())
-    init(&retVals[0], retVals.size());
-}
-ReturnInst::ReturnInst(const std::vector<Value *> &retVals)
-  : TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, retVals.size()) {
-  if (!retVals.empty())
-    init(&retVals[0], retVals.size());
-}
-
 ReturnInst::ReturnInst(Value * const* retVals, unsigned N,
                        Instruction *InsertBefore)
   : TerminatorInst(Type::VoidTy, Instruction::Ret, &RetVal, N, InsertBefore) {