Adjust to changes in User class.

llvm-svn: 19892
This commit is contained in:
Chris Lattner 2005-01-29 00:35:33 +00:00
parent 12f9442dc3
commit 50d674e9da
4 changed files with 18 additions and 18 deletions

View File

@ -26,7 +26,7 @@ namespace {
/// 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);
}

View File

@ -87,7 +87,7 @@ void Argument::setParent(Function *parent) {
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);

View File

@ -72,14 +72,17 @@ void GlobalValue::destroyConstant() {
//===----------------------------------------------------------------------===//
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);

View File

@ -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,
}
}
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!");