Adjust to changes in User class.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19892 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp
index b399c55..25507ce 100644
--- a/lib/VMCore/BasicBlock.cpp
+++ b/lib/VMCore/BasicBlock.cpp
@@ -26,7 +26,7 @@
/// DummyInst - An instance of this class is used to mark the end of the
/// instruction list. This is not a real instruction.
struct DummyInst : public Instruction {
- DummyInst() : Instruction(Type::VoidTy, OtherOpsEnd) {
+ DummyInst() : Instruction(Type::VoidTy, OtherOpsEnd, 0, 0) {
// This should not be garbage monitored.
LeakDetector::removeGarbageObject(this);
}
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 340bb1b..c63b1ac 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -87,7 +87,7 @@
Function::Function(const FunctionType *Ty, LinkageTypes Linkage,
const std::string &name, Module *ParentModule)
- : GlobalValue(PointerType::get(Ty), Value::FunctionVal, Linkage, name) {
+ : GlobalValue(PointerType::get(Ty), Value::FunctionVal, 0, 0, Linkage, name) {
BasicBlocks.setItemParent(this);
BasicBlocks.setParent(this);
ArgumentList.setItemParent(this);
diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp
index 731f495..8bcb531 100644
--- a/lib/VMCore/Globals.cpp
+++ b/lib/VMCore/Globals.cpp
@@ -72,14 +72,17 @@
//===----------------------------------------------------------------------===//
GlobalVariable::GlobalVariable(const Type *Ty, bool constant, LinkageTypes Link,
- Constant *Initializer,
+ Constant *InitVal,
const std::string &Name, Module *ParentModule)
- : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal, Link, Name),
+ : GlobalValue(PointerType::get(Ty), Value::GlobalVariableVal,
+ &Initializer, InitVal != 0, Link, Name),
isConstantGlobal(constant) {
- if (Initializer) {
- assert(Initializer->getType() == Ty &&
+ if (InitVal) {
+ assert(InitVal->getType() == Ty &&
"Initializer should be the same type as the GlobalVariable!");
- Operands.push_back(Use((Value*)Initializer, this));
+ Initializer.init(InitVal, this);
+ } else {
+ Initializer.init(0, this);
}
LeakDetector::addGarbageObject(this);
diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 696b12e..b449c99 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -18,15 +18,11 @@
#include "llvm/Support/LeakDetector.h"
using namespace llvm;
-void Instruction::init() {
+Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
+ const std::string &Name, Instruction *InsertBefore)
+ : User(ty, Value::InstructionVal + it, Ops, NumOps, Name), Parent(0) {
// Make sure that we get added to a basicblock
LeakDetector::addGarbageObject(this);
-}
-
-Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name,
- Instruction *InsertBefore)
- : User(ty, Value::InstructionVal + it, Name), Parent(0) {
- init();
// If requested, insert this instruction into a basic block...
if (InsertBefore) {
@@ -36,10 +32,11 @@
}
}
-Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name,
- BasicBlock *InsertAtEnd)
- : User(ty, Value::InstructionVal + it, Name), Parent(0) {
- init();
+Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
+ const std::string &Name, BasicBlock *InsertAtEnd)
+ : User(ty, Value::InstructionVal + it, Ops, NumOps, Name), Parent(0) {
+ // Make sure that we get added to a basicblock
+ LeakDetector::addGarbageObject(this);
// append this instruction into the basic block
assert(InsertAtEnd && "Basic block to append to may not be NULL!");