mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-07 11:26:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Build fix for the latest LLVMContext changes (LLVM r75445)

Browse source 
This shouldn't break the build with older LLVM revs. We include
LLVMContext.h in gen/llvm.h now to make the transition a little bit
easier.
This commit is contained in:
Benjamin Kramer 2009-07-13 12:17:58 +02:00
parent 8576788245
commit 331319dab1
16 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/classes.cpp
View file

@ -211,7 +211,7 @@ void DtoInitClass(TypeClass* tc, LLValue* dst)
// monitor always defaults to zero
tmp = DtoGEPi(dst,0,1,"monitor");
val = llvm::Constant::getNullValue(tmp->getType()->getContainedType(0));
val = llvm::getGlobalContext().getNullValue(tmp->getType()->getContainedType(0));
DtoStore(val, tmp);
// done?
@ -262,7 +262,7 @@ DValue* DtoCastClass(DValue* val, Type* _to)
else if (to->ty == Tbool) {
IF_LOG Logger::println("to bool");
LLValue* llval = val->getRVal();
LLValue* zero = LLConstant::getNullValue(llval->getType());
LLValue* zero = llvm::getGlobalContext().getNullValue(llval->getType());
return new DImValue(_to, gIR->ir->CreateICmpNE(llval, zero, "tmp"));
}
// class -> integer
@ -326,8 +326,8 @@ DValue* DtoCastClass(DValue* val, Type* _to)
// Sure we could have jumped over the code above in this case, but
// it's just a GEP and (maybe) a pointer-to-pointer BitCast, so it
// should be pretty cheap and perfectly safe even if the original was null.
LLValue* isNull = gIR->ir->CreateICmpEQ(orig, LLConstant::getNullValue(orig->getType()), ".nullcheck");
v = gIR->ir->CreateSelect(isNull, LLConstant::getNullValue(ifType), v, ".interface");
LLValue* isNull = gIR->ir->CreateICmpEQ(orig, llvm::getGlobalContext().getNullValue(orig->getType()), ".nullcheck");
v = gIR->ir->CreateSelect(isNull, llvm::getGlobalContext().getNullValue(ifType), v, ".interface");
// return r-value
return new DImValue(_to, v);
@ -602,7 +602,7 @@ static LLConstant* build_offti_array(ClassDeclaration* cd, const LLType* arrayT)
LLConstant* ptr;
if (nvars == 0)
return LLConstant::getNullValue( arrayT );
return llvm::getGlobalContext().getNullValue( arrayT );
// array type
const llvm::ArrayType* arrTy = llvm::ArrayType::get(arrayInits[0]->getType(), nvars);