[vmkit-commits] [vmkit] r77970 - in /vmkit/trunk/lib: JnJVM/Compiler/ExceptionsCheck.inc JnJVM/Compiler/JavaAOTCompiler.cpp JnJVM/Compiler/JavaJIT.cpp JnJVM/Compiler/JnjvmModule.cpp Mvm/Compiler/JIT.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Mon Aug 3 02:27:09 PDT 2009
Author: geoffray
Date: Mon Aug 3 04:26:51 2009
New Revision: 77970
URL: http://llvm.org/viewvc/llvm-project?rev=77970&view=rev
Log:
Move to new LLVM API.
Modified:
vmkit/trunk/lib/JnJVM/Compiler/ExceptionsCheck.inc
vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
Modified: vmkit/trunk/lib/JnJVM/Compiler/ExceptionsCheck.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/ExceptionsCheck.inc?rev=77970&r1=77969&r2=77970&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/ExceptionsCheck.inc (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/ExceptionsCheck.inc Mon Aug 3 04:26:51 2009
@@ -214,7 +214,7 @@
BranchInst::Create(currentExceptionBlock, currentBlock);
} else {
if (endNode) {
- endNode->addIncoming(llvmContext->getNullValue(endNode->getType()),
+ endNode->addIncoming(Constant::getNullValue(endNode->getType()),
currentBlock);
}
BranchInst::Create(endBlock, currentBlock);
@@ -237,7 +237,7 @@
BranchInst::Create(currentExceptionBlock, currentBlock);
} else {
if (endNode) {
- endNode->addIncoming(llvmContext->getNullValue(endNode->getType()),
+ endNode->addIncoming(Constant::getNullValue(endNode->getType()),
currentBlock);
}
BranchInst::Create(endBlock, currentBlock);
@@ -254,7 +254,7 @@
BranchInst::Create(currentExceptionBlock, currentBlock);
} else {
if (endNode) {
- endNode->addIncoming(llvmContext->getNullValue(endNode->getType()),
+ endNode->addIncoming(Constant::getNullValue(endNode->getType()),
currentBlock);
}
BranchInst::Create(endBlock, currentBlock);
@@ -534,7 +534,7 @@
endExceptionBlock->eraseFromParent();
} else {
if (endNode) {
- endNode->addIncoming(llvmContext->getNullValue(endNode->getType()),
+ endNode->addIncoming(Constant::getNullValue(endNode->getType()),
endExceptionBlock);
}
BranchInst::Create(endBlock, endExceptionBlock);
@@ -557,7 +557,7 @@
Instruction* insn = BI->begin();
PHINode* node = dyn_cast<PHINode>(insn);
if (node) {
- node->replaceAllUsesWith(llvmContext->getNullValue(node->getType()));
+ node->replaceAllUsesWith(Constant::getNullValue(node->getType()));
node->eraseFromParent();
}
}
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=77970&r1=77969&r2=77970&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Mon Aug 3 04:26:51 2009
@@ -97,7 +97,7 @@
GlobalVariable* varGV =
new GlobalVariable(Mod, Ty, false, GlobalValue::InternalLinkage,
- Mod.getContext().getNullValue(Ty),
+ Constant::getNullValue(Ty),
UTF8Buffer(classDef->name).toCompileName()->cString());
arrayClasses.insert(std::make_pair(classDef->asArrayClass(), varGV));
@@ -121,7 +121,7 @@
varGV = new GlobalVariable(Mod, Ty, false,
GlobalValue::InternalLinkage,
- Mod.getContext().getNullValue(Ty), "");
+ Constant::getNullValue(Ty), "");
constantPools.insert(std::make_pair(ctp, varGV));
return varGV;
} else {
@@ -325,7 +325,6 @@
LLVMClassInfo* LCI = getClassInfo(cl);
const Type* Ty = LCI->getStaticType();
const StructType* STy = dyn_cast<StructType>(Ty->getContainedType(0));
- Module& Mod = *getLLVMModule();
std::vector<Constant*> Elts;
@@ -375,11 +374,11 @@
Constant* CO = getFinalObject(val);
Elts.push_back(CO);
} else {
- Elts.push_back(Mod.getContext().getNullValue(Ty));
+ Elts.push_back(Constant::getNullValue(Ty));
}
}
} else {
- Elts.push_back(Mod.getContext().getNullValue(Ty));
+ Elts.push_back(Constant::getNullValue(Ty));
}
} else {
Reader reader(attribut, &(cl->bytes));
@@ -500,7 +499,7 @@
Module& Mod = *getLLVMModule();
varGV = new GlobalVariable(Mod, valPtrType, true,
GlobalValue::InternalLinkage,
- Mod.getContext().getNullValue(valPtrType), "");
+ Constant::getNullValue(valPtrType), "");
nativeFunctions.insert(std::make_pair(meth, varGV));
return varGV;
@@ -528,10 +527,8 @@
Constant* JavaAOTCompiler::CreateConstantFromJavaClass(CommonClass* cl) {
Class* javaClass = cl->classLoader->bootstrapLoader->upcalls->newClass;
LLVMClassInfo* LCI = getClassInfo(javaClass);
- Module& Mod = *getLLVMModule();
const StructType* STy =
dyn_cast<StructType>(LCI->getVirtualType()->getContainedType(0));
- LLVMContext& Context = Mod.getContext();
std::vector<Constant*> Elmts;
@@ -539,10 +536,10 @@
Elmts.push_back(CreateConstantForBaseObject(javaClass));
// signers
- Elmts.push_back(Context.getNullValue(JnjvmModule::JavaObjectType));
+ Elmts.push_back(Constant::getNullValue(JnjvmModule::JavaObjectType));
// pd
- Elmts.push_back(Context.getNullValue(JnjvmModule::JavaObjectType));
+ Elmts.push_back(Constant::getNullValue(JnjvmModule::JavaObjectType));
// vmdata
Constant* Cl = getNativeClass(cl);
@@ -551,14 +548,13 @@
Elmts.push_back(Cl);
// constructor
- Elmts.push_back(Context.getNullValue(JnjvmModule::JavaObjectType));
+ Elmts.push_back(Constant::getNullValue(JnjvmModule::JavaObjectType));
return ConstantStruct::get(STy, Elmts);
}
Constant* JavaAOTCompiler::CreateConstantFromJavaObject(JavaObject* obj) {
CommonClass* cl = obj->getClass();
- Module& Mod = *getLLVMModule();
if (cl->isArray()) {
Classpath* upcalls = cl->classLoader->bootstrapLoader->upcalls;
@@ -650,7 +646,7 @@
TempElts.push_back(C);
} else {
const llvm::Type* Ty = JnjvmModule::JavaObjectType;
- TempElts.push_back(Mod.getContext().getNullValue(Ty));
+ TempElts.push_back(Constant::getNullValue(Ty));
}
}
}
@@ -694,12 +690,11 @@
Constant* JavaAOTCompiler::CreateConstantFromCacheNode(CacheNode* CN) {
const StructType* STy =
dyn_cast<StructType>(JnjvmModule::CacheNodeType->getContainedType(0));
- LLVMContext& Context = getLLVMModule()->getContext();
std::vector<Constant*> Elmts;
- Elmts.push_back(Context.getNullValue(STy->getContainedType(0)));
- Elmts.push_back(Context.getNullValue(STy->getContainedType(1)));
- Elmts.push_back(Context.getNullValue(STy->getContainedType(2)));
+ Elmts.push_back(Constant::getNullValue(STy->getContainedType(0)));
+ Elmts.push_back(Constant::getNullValue(STy->getContainedType(1)));
+ Elmts.push_back(Constant::getNullValue(STy->getContainedType(2)));
Elmts.push_back(getEnveloppe(CN->enveloppe));
return ConstantStruct::get(STy, Elmts);
@@ -711,8 +706,6 @@
dyn_cast<StructType>(JnjvmModule::EnveloppeType->getContainedType(0));
const StructType* CNTy =
dyn_cast<StructType>(JnjvmModule::CacheNodeType->getContainedType(0));
- Module& Mod = *getLLVMModule();
- LLVMContext& Context = Mod.getContext();
std::vector<Constant*> Elmts;
@@ -723,7 +716,7 @@
Elmts.push_back(getUTF8(val->methodName));
Elmts.push_back(getUTF8(val->methodSign));
- Elmts.push_back(Context.getNullValue(Type::Int32Ty));
+ Elmts.push_back(Constant::getNullValue(Type::Int32Ty));
Elmts.push_back(getNativeClass(val->classDef));
Elmts.push_back(firstCache);
@@ -754,7 +747,6 @@
const StructType* STy =
dyn_cast<StructType>(JnjvmModule::JavaCommonClassType->getContainedType(0));
Module& Mod = *getLLVMModule();
- LLVMContext& Context = getLLVMModule()->getContext();
const llvm::Type* TempTy = 0;
@@ -788,7 +780,7 @@
CommonClassElts.push_back(interfaces);
} else {
const Type* Ty = PointerType::getUnqual(JnjvmModule::JavaClassType);
- CommonClassElts.push_back(Context.getNullValue(Ty));
+ CommonClassElts.push_back(Constant::getNullValue(Ty));
}
// nbInterfaces
@@ -802,7 +794,7 @@
CommonClassElts.push_back(getNativeClass(cl->super));
} else {
TempTy = JnjvmModule::JavaClassType;
- CommonClassElts.push_back(Mod.getContext().getNullValue(TempTy));
+ CommonClassElts.push_back(Constant::getNullValue(TempTy));
}
// classLoader: store the static initializer, it will be overriden once
@@ -816,7 +808,7 @@
CommonClassElts.push_back(getVirtualTable(cl->virtualVT));
} else {
TempTy = JnjvmModule::VTType;
- CommonClassElts.push_back(Mod.getContext().getNullValue(TempTy));
+ CommonClassElts.push_back(Constant::getNullValue(TempTy));
}
return ConstantStruct::get(STy, CommonClassElts);
}
@@ -824,13 +816,12 @@
Constant* JavaAOTCompiler::CreateConstantFromJavaField(JavaField& field) {
const StructType* STy =
dyn_cast<StructType>(JnjvmModule::JavaFieldType->getContainedType(0));
- Module& Mod = *getLLVMModule();
std::vector<Constant*> FieldElts;
std::vector<Constant*> TempElts;
// signature
- FieldElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
+ FieldElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
// access
FieldElts.push_back(ConstantInt::get(Type::Int16Ty, field.access));
@@ -859,7 +850,7 @@
FieldElts.push_back(attributs);
} else {
- FieldElts.push_back(Mod.getContext().getNullValue(JnjvmModule::AttributType));
+ FieldElts.push_back(Constant::getNullValue(JnjvmModule::AttributType));
}
// nbAttributs
@@ -875,7 +866,7 @@
FieldElts.push_back(ConstantInt::get(Type::Int16Ty, field.num));
//JInfo
- FieldElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
+ FieldElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
return ConstantStruct::get(STy, FieldElts);
}
@@ -884,13 +875,12 @@
const StructType* STy =
dyn_cast<StructType>(JnjvmModule::JavaMethodType->getContainedType(0));
Module& Mod = *getLLVMModule();
- LLVMContext& Context = Mod.getContext();
std::vector<Constant*> MethodElts;
std::vector<Constant*> TempElts;
// signature
- MethodElts.push_back(Context.getNullValue(JnjvmModule::ptrType));
+ MethodElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
// access
MethodElts.push_back(ConstantInt::get(Type::Int16Ty, method.access));
@@ -913,7 +903,7 @@
MethodElts.push_back(attributs);
} else {
- MethodElts.push_back(Context.getNullValue(JnjvmModule::AttributType));
+ MethodElts.push_back(Constant::getNullValue(JnjvmModule::AttributType));
}
// nbAttributs
@@ -921,7 +911,7 @@
// enveloppes
// already allocated by the JIT, don't reallocate them.
- MethodElts.push_back(Context.getNullValue(JnjvmModule::EnveloppeType));
+ MethodElts.push_back(Constant::getNullValue(JnjvmModule::EnveloppeType));
// nbEnveloppes
// 0 because we're not allocating here.
@@ -941,7 +931,7 @@
// code
if (isAbstract(method.access)) {
- MethodElts.push_back(Context.getNullValue(JnjvmModule::ptrType));
+ MethodElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
} else {
LLVMMethodInfo* LMI = getMethodInfo(&method);
Function* func = LMI->getMethod();
@@ -953,7 +943,7 @@
MethodElts.push_back(ConstantInt::get(Type::Int32Ty, method.offset));
//JInfo
- MethodElts.push_back(Context.getNullValue(JnjvmModule::ptrType));
+ MethodElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
return ConstantStruct::get(STy, MethodElts);
}
@@ -999,7 +989,6 @@
const StructType* STy =
dyn_cast<StructType>(JnjvmModule::JavaClassType->getContainedType(0));
Module& Mod = *getLLVMModule();
- LLVMContext& Context = getLLVMModule()->getContext();
std::vector<Constant*> ClassElts;
std::vector<Constant*> TempElts;
@@ -1026,7 +1015,7 @@
ClassElts.push_back(ConstantArray::get(ATy, CStr, 1));
// thinlock
- ClassElts.push_back(Context.getNullValue(JnjvmModule::ptrType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
if (cl->nbVirtualFields + cl->nbStaticFields) {
ATy = ArrayType::get(JnjvmModule::JavaFieldType->getContainedType(0),
@@ -1062,7 +1051,7 @@
fields = ConstantExpr::getCast(Instruction::BitCast, fields,
JnjvmModule::JavaFieldType);
} else {
- fields = Context.getNullValue(JnjvmModule::JavaFieldType);
+ fields = Constant::getNullValue(JnjvmModule::JavaFieldType);
}
// virtualFields
@@ -1076,7 +1065,7 @@
// staticFields
// Output null, getLLVMModule() will be set in the initializer. Otherwise, the
// assembly emitter of LLVM will try to align the data.
- ClassElts.push_back(Context.getNullValue(JnjvmModule::JavaFieldType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::JavaFieldType));
// nbStaticFields
ClassElts.push_back(ConstantInt::get(Type::Int16Ty, cl->nbStaticFields));
@@ -1110,7 +1099,7 @@
methods = ConstantExpr::getCast(Instruction::BitCast, GV,
JnjvmModule::JavaMethodType);
} else {
- methods = Context.getNullValue(JnjvmModule::JavaMethodType);
+ methods = Constant::getNullValue(JnjvmModule::JavaMethodType);
}
// virtualMethods
@@ -1123,19 +1112,19 @@
// staticMethods
// Output null, getLLVMModule() will be set in the initializer.
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::JavaMethodType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::JavaMethodType));
// nbStaticMethods
ClassElts.push_back(ConstantInt::get(Type::Int16Ty, cl->nbStaticMethods));
// ownerClass
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
// bytes
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::JavaArrayUInt8Type));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::JavaArrayUInt8Type));
// ctpInfo
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
// attributs
if (cl->nbAttributs) {
@@ -1155,7 +1144,7 @@
JnjvmModule::AttributType);
ClassElts.push_back(attributs);
} else {
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::AttributType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::AttributType));
}
// nbAttributs
@@ -1179,7 +1168,7 @@
ClassElts.push_back(innerClasses);
} else {
const Type* Ty = PointerType::getUnqual(JnjvmModule::JavaClassType);
- ClassElts.push_back(Mod.getContext().getNullValue(Ty));
+ ClassElts.push_back(Constant::getNullValue(Ty));
}
// nbInnerClasses
@@ -1189,7 +1178,7 @@
if (cl->outerClass) {
ClassElts.push_back(getNativeClass(cl->outerClass));
} else {
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::JavaClassType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::JavaClassType));
}
// innerAccess
@@ -1208,14 +1197,13 @@
ClassElts.push_back(ConstantInt::get(Type::Int32Ty, cl->staticSize));
// JInfo
- ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
+ ClassElts.push_back(Constant::getNullValue(JnjvmModule::ptrType));
return ConstantStruct::get(STy, ClassElts);
}
template<typename T>
Constant* JavaAOTCompiler::CreateConstantFromArray(const T* val, const Type* Ty) {
- Module& Mod = *getLLVMModule();
std::vector<const Type*> Elemts;
const ArrayType* ATy = ArrayType::get(Ty, val->size);
Elemts.push_back(JnjvmModule::JavaObjectType->getContainedType(0));
@@ -1240,7 +1228,7 @@
if (val->elements[i]) {
Vals.push_back(getFinalObject((JavaObject*)(size_t)val->elements[i]));
} else {
- Vals.push_back(Mod.getContext().getNullValue(JnjvmModule::JavaObjectType));
+ Vals.push_back(Constant::getNullValue(JnjvmModule::JavaObjectType));
}
}
}
@@ -1294,7 +1282,6 @@
}
Constant* JavaAOTCompiler::CreateConstantFromVT(JavaVirtualTable* VT) {
- Module& Mod = *getLLVMModule();
CommonClass* classDef = VT->cl;
uint32 size = classDef->isClass() ? classDef->asClass()->virtualTableSize :
JavaVirtualTable::getBaseSize();
@@ -1360,7 +1347,7 @@
Temp = ConstantExpr::getBitCast(Temp, PTy);
Elemts.push_back(Temp);
} else {
- Elemts.push_back(Mod.getContext().getNullValue(PTy));
+ Elemts.push_back(Constant::getNullValue(PTy));
}
}
@@ -1395,7 +1382,7 @@
Temp = ConstantExpr::getBitCast(Temp, PTy);
Elemts.push_back(Temp);
} else {
- Elemts.push_back(Mod.getContext().getNullValue(PTy));
+ Elemts.push_back(Constant::getNullValue(PTy));
}
@@ -1405,7 +1392,7 @@
LLVMMethodInfo* LMI = getMethodInfo(meth);
Function* F = LMI->getMethod();
if (isAbstract(meth->access)) {
- Elemts.push_back(Mod.getContext().getNullValue(PTy));
+ Elemts.push_back(Constant::getNullValue(PTy));
} else {
Elemts.push_back(ConstantExpr::getCast(Instruction::BitCast, F, PTy));
}
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp?rev=77970&r1=77969&r2=77970&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Mon Aug 3 04:26:51 2009
@@ -255,7 +255,7 @@
currentBlock = createBasicBlock("start");
CallInst::Create(module->ThrowExceptionFromJITFunction, "", currentBlock);
if (returnType != Type::VoidTy)
- ReturnInst::Create(llvmContext->getNullValue(returnType), currentBlock);
+ ReturnInst::Create(Constant::getNullValue(returnType), currentBlock);
else
ReturnInst::Create(currentBlock);
@@ -302,7 +302,7 @@
if (returnType != Type::VoidTy) {
endNode = PHINode::Create(returnType, "", endBlock);
- endNode->addIncoming(llvmContext->getNullValue(returnType),
+ endNode->addIncoming(Constant::getNullValue(returnType),
currentBlock);
}
@@ -352,7 +352,7 @@
test = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, i,
module->JavaObjectNullConstant, "");
- node->addIncoming(llvmContext->getNullValue(Ty), currentBlock);
+ node->addIncoming(Constant::getNullValue(Ty), currentBlock);
BranchInst::Create(BB, NotZero, test, currentBlock);
currentBlock = NotZero;
@@ -395,7 +395,7 @@
PHINode* node = PHINode::Create(Ty, "", endBlock);
node->addIncoming(test, currentBlock);
Value* cmp = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, test,
- llvmContext->getNullValue(Ty), "");
+ Constant::getNullValue(Ty), "");
BranchInst::Create(unloadedBlock, endBlock, cmp, currentBlock);
currentBlock = unloadedBlock;
@@ -430,7 +430,7 @@
if (returnType == module->JavaObjectType) {
const Type* Ty = PointerType::getUnqual(module->JavaObjectType);
- Constant* C = llvmContext->getNullValue(Ty);
+ Constant* C = Constant::getNullValue(Ty);
Value* cmp = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, result, C, "");
BasicBlock* loadBlock = createBasicBlock("");
@@ -1105,11 +1105,11 @@
if (isa<UnreachableInst>(I)) {
I->eraseFromParent();
BranchInst::Create(endBlock, currentBlock);
- endNode->addIncoming(llvmContext->getNullValue(returnType),
+ endNode->addIncoming(Constant::getNullValue(returnType),
currentBlock);
} else if (InvokeInst* II = dyn_cast<InvokeInst>(I)) {
II->setNormalDest(endBlock);
- endNode->addIncoming(llvmContext->getNullValue(returnType),
+ endNode->addIncoming(Constant::getNullValue(returnType),
currentBlock);
}
@@ -1360,27 +1360,27 @@
switch (*i) {
case Int : {
PHINode* node = PHINode::Create(Type::Int32Ty, "", dest);
- node->addIncoming(llvmContext->getNullValue(Type::Int32Ty), insert);
+ node->addIncoming(Constant::getNullValue(Type::Int32Ty), insert);
break;
}
case Float : {
PHINode* node = PHINode::Create(Type::FloatTy, "", dest);
- node->addIncoming(llvmContext->getNullValue(Type::FloatTy), insert);
+ node->addIncoming(Constant::getNullValue(Type::FloatTy), insert);
break;
}
case Double : {
PHINode* node = PHINode::Create(Type::DoubleTy, "", dest);
- node->addIncoming(llvmContext->getNullValue(Type::DoubleTy), insert);
+ node->addIncoming(Constant::getNullValue(Type::DoubleTy), insert);
break;
}
case Long : {
PHINode* node = PHINode::Create(Type::Int64Ty, "", dest);
- node->addIncoming(llvmContext->getNullValue(Type::Int64Ty), insert);
+ node->addIncoming(Constant::getNullValue(Type::Int64Ty), insert);
break;
}
case Object : {
PHINode* node = PHINode::Create(module->JavaObjectType, "", dest);
- node->addIncoming(llvmContext->getNullValue(module->JavaObjectType),
+ node->addIncoming(Constant::getNullValue(module->JavaObjectType),
insert);
break;
}
@@ -1391,7 +1391,7 @@
} else {
for (BasicBlock::iterator i = dest->begin(), e = dest->end(); i != e; ++i) {
if (PHINode* node = dyn_cast<PHINode>(i)) {
- node->addIncoming(llvmContext->getNullValue(node->getType()), insert);
+ node->addIncoming(Constant::getNullValue(node->getType()), insert);
} else {
break;
}
@@ -1558,7 +1558,7 @@
#if defined(ISOLATE_SHARING)
const Type* Ty = module->ConstantPoolType;
- Constant* Nil = llvmContext->getNullValue(Ty);
+ Constant* Nil = Constant::getNullValue(Ty);
GlobalVariable* GV = new GlobalVariable(Ty, false,
GlobalValue::ExternalLinkage, Nil,
"", module);
Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=77970&r1=77969&r2=77970&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Mon Aug 3 04:26:51 2009
@@ -174,7 +174,7 @@
}
JavaObjectNullConstant =
- module->getContext().getNullValue(JnjvmModule::JavaObjectType);
+ Constant::getNullValue(JnjvmModule::JavaObjectType);
MaxArraySizeConstant = ConstantInt::get(Type::Int32Ty,
JavaArray::MaxArraySize);
JavaArraySizeConstant =
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=77970&r1=77969&r2=77970&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Aug 3 04:26:51 2009
@@ -94,7 +94,6 @@
module->setDataLayout(globalModule->getDataLayout());
module->setTargetTriple(globalModule->getTargetTriple());
- LLVMContext* globalContext = &(module->getContext());
// Constant declaration
@@ -144,7 +143,7 @@
constantPtrOne = ConstantInt::get(pointerSizeType, 1);
constantPtrZero = ConstantInt::get(pointerSizeType, 0);
- constantPtrNull = globalContext->getNullValue(ptrType);
+ constantPtrNull = Constant::getNullValue(ptrType);
constantPtrLogSize =
ConstantInt::get(Type::Int32Ty, sizeof(void*) == 8 ? 3 : 2);
arrayPtrType = PointerType::getUnqual(ArrayType::get(Type::Int8Ty, 0));
More information about the vmkit-commits
mailing list