From cad28bd3a059f25aef7edc35bf2454f21000ae85 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sat, 29 Jan 2005 00:36:19 +0000
Subject: Adjust to changes in User class and minor changes in instruction
 ctors.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19894 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Bytecode/Reader/Reader.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'lib/Bytecode/Reader/Reader.cpp')

diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index e9b18e0cea..a36aa99509 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -32,17 +32,15 @@
 using namespace llvm;
 
 namespace {
-
-/// @brief A class for maintaining the slot number definition
-/// as a placeholder for the actual definition for forward constants defs.
-class ConstantPlaceHolder : public ConstantExpr {
-  ConstantPlaceHolder();                       // DO NOT IMPLEMENT
-  void operator=(const ConstantPlaceHolder &); // DO NOT IMPLEMENT
-public:
-  ConstantPlaceHolder(const Type *Ty) 
-    : ConstantExpr(Instruction::UserOp1, Constant::getNullValue(Ty), Ty) {}
-};
-
+  /// @brief A class for maintaining the slot number definition
+  /// as a placeholder for the actual definition for forward constants defs.
+  class ConstantPlaceHolder : public ConstantExpr {
+    ConstantPlaceHolder();                       // DO NOT IMPLEMENT
+    void operator=(const ConstantPlaceHolder &); // DO NOT IMPLEMENT
+  public:
+    ConstantPlaceHolder(const Type *Ty) 
+      : ConstantExpr(Ty, Instruction::UserOp1, 0, 0) {}
+  };
 }
 
 // Provide some details on error
@@ -671,7 +669,7 @@ void BytecodeReader::ParseInstruction(std::vector<unsigned> &Oprnds,
       error("Invalid phi node encountered!");
 
     PHINode *PN = new PHINode(InstTy);
-    PN->op_reserve(Oprnds.size());
+    PN->reserveOperandSpace(Oprnds.size());
     for (unsigned i = 0, e = Oprnds.size(); i != e; i += 2)
       PN->addIncoming(getValue(iType, Oprnds[i]), getBasicBlock(Oprnds[i+1]));
     Result = PN;
@@ -707,7 +705,8 @@ void BytecodeReader::ParseInstruction(std::vector<unsigned> &Oprnds,
       error("Switch statement with odd number of arguments!");
 
     SwitchInst *I = new SwitchInst(getValue(iType, Oprnds[0]),
-                                   getBasicBlock(Oprnds[1]));
+                                   getBasicBlock(Oprnds[1]),
+                                   Oprnds.size()/2-1);
     for (unsigned i = 2, e = Oprnds.size(); i != e; i += 2)
       I->addCase(cast<Constant>(getValue(iType, Oprnds[i])),
                  getBasicBlock(Oprnds[i+1]));
-- 
cgit v1.2.3-18-g5258