Mercurial > projects > ldc
changeset 1560:1d5c3354b3c2
getNullValue is in Constant again
Requires LLVM >= r77721
author | Benjamin Kramer <benny.kra@gmail.com> |
---|---|
date | Fri, 31 Jul 2009 23:01:29 +0200 |
parents | 06d5cc873350 |
children | 8912aabdb26e |
files | gen/aa.cpp gen/arrays.cpp gen/classes.cpp gen/complex.cpp gen/functions.cpp gen/llvmhelpers.cpp gen/statements.cpp gen/structs.cpp gen/todebug.cpp gen/toir.cpp gen/tollvm.cpp gen/toobj.cpp ir/irstruct.cpp |
diffstat | 13 files changed, 35 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/gen/aa.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/aa.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -105,7 +105,7 @@ llvm::BasicBlock* failbb = llvm::BasicBlock::Create("aaboundscheckfail", gIR->topfunc(), oldend); llvm::BasicBlock* okbb = llvm::BasicBlock::Create("aaboundsok", gIR->topfunc(), oldend); - LLValue* nullaa = gIR->context().getNullValue(ret->getType()); + LLValue* nullaa = LLConstant::getNullValue(ret->getType()); LLValue* cond = gIR->ir->CreateICmpNE(nullaa, ret, "aaboundscheck"); gIR->ir->CreateCondBr(cond, okbb, failbb);
--- a/gen/arrays.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/arrays.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -60,7 +60,7 @@ assert(isaPointer(v)); const LLType* t = v->getType()->getContainedType(0); - DtoStore(gIR->context().getNullValue(t), v); + DtoStore(LLConstant::getNullValue(t), v); } //////////////////////////////////////////////////////////////////////////////////////////
--- a/gen/classes.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/classes.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -211,7 +211,7 @@ // monitor always defaults to zero tmp = DtoGEPi(dst,0,1,"monitor"); - val = gIR->context().getNullValue(tmp->getType()->getContainedType(0)); + val = LLConstant::getNullValue(tmp->getType()->getContainedType(0)); DtoStore(val, tmp); // done? @@ -262,7 +262,7 @@ else if (to->ty == Tbool) { IF_LOG Logger::println("to bool"); LLValue* llval = val->getRVal(); - LLValue* zero = gIR->context().getNullValue(llval->getType()); + LLValue* zero = LLConstant::getNullValue(llval->getType()); return new DImValue(_to, gIR->ir->CreateICmpNE(llval, zero, "tmp")); } // class -> integer @@ -326,8 +326,8 @@ // 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, gIR->context().getNullValue(orig->getType()), ".nullcheck"); - v = gIR->ir->CreateSelect(isNull, gIR->context().getNullValue(ifType), v, ".interface"); + LLValue* isNull = gIR->ir->CreateICmpEQ(orig, LLConstant::getNullValue(orig->getType()), ".nullcheck"); + v = gIR->ir->CreateSelect(isNull, LLConstant::getNullValue(ifType), v, ".interface"); // return r-value return new DImValue(_to, v); @@ -602,7 +602,7 @@ LLConstant* ptr; if (nvars == 0) - return gIR->context().getNullValue( arrayT ); + return LLConstant::getNullValue( arrayT ); // array type const llvm::ArrayType* arrTy = llvm::ArrayType::get(arrayInits[0]->getType(), nvars);
--- a/gen/complex.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/complex.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -111,9 +111,9 @@ DtoGetComplexParts(loc, to, val, re, im); if(!re) - re = gIR->context().getNullValue(DtoType(baserety)); + re = LLConstant::getNullValue(DtoType(baserety)); if(!im) - im = gIR->context().getNullValue(DtoType(baseimty)); + im = LLConstant::getNullValue(DtoType(baseimty)); LLValue* res = DtoAggrPair(complexTy, re, im);
--- a/gen/functions.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/functions.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -811,7 +811,7 @@ } } else - llvm::ReturnInst::Create(gIR->context().getNullValue(func->getReturnType()), bb); + llvm::ReturnInst::Create(LLConstant::getNullValue(func->getReturnType()), bb); } // std::cout << *func << std::endl;
--- a/gen/llvmhelpers.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/llvmhelpers.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -463,13 +463,13 @@ if (basetype->iscomplex()) { const LLType* basefp = DtoComplexBaseType(basetype); - LLValue* res = DtoAggrPair(DtoType(type), gIR->context().getNullValue(basefp), gIR->context().getNullValue(basefp)); + LLValue* res = DtoAggrPair(DtoType(type), LLConstant::getNullValue(basefp), LLConstant::getNullValue(basefp)); return new DImValue(type, res); } // integer, floating, pointer and class have no special representation else if (basetype->isintegral() || basetype->isfloating() || basety == Tpointer || basety == Tclass) { - return new DConstValue(type, gIR->context().getNullValue(lltype)); + return new DConstValue(type, LLConstant::getNullValue(lltype)); } // dynamic array else if (basety == Tarray) @@ -481,7 +481,7 @@ // delegate else if (basety == Tdelegate) { - return new DNullValue(type, gIR->context().getNullValue(lltype)); + return new DNullValue(type, LLConstant::getNullValue(lltype)); } // unknown @@ -576,7 +576,7 @@ } else if (totype->ty == Tbool) { LLValue* src = val->getRVal(); - LLValue* zero = gIR->context().getNullValue(src->getType()); + LLValue* zero = LLConstant::getNullValue(src->getType()); rval = gIR->ir->CreateICmpNE(src, zero, "tmp"); } else if (totype->isintegral()) { @@ -608,7 +608,7 @@ if (totype->ty == Tbool) { rval = val->getRVal(); - LLValue* zero = gIR->context().getNullValue(rval->getType()); + LLValue* zero = LLConstant::getNullValue(rval->getType()); rval = gIR->ir->CreateFCmpUNE(rval, zero, "tmp"); } else if (totype->iscomplex()) { @@ -1123,7 +1123,7 @@ { Logger::println("const void initializer"); const LLType* ty = DtoType(type); - _init = gIR->context().getNullValue(ty); + _init = LLConstant::getNullValue(ty); } else { Logger::println("unsupported const initializer: %s", init->toChars());
--- a/gen/statements.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/statements.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -112,7 +112,7 @@ // and return 0 instead // if we're not in main, just bitcast if (p->topfunc() == p->mainFunc) - v = gIR->context().getNullValue(p->mainFunc->getReturnType()); + v = LLConstant::getNullValue(p->mainFunc->getReturnType()); else v = gIR->ir->CreateBitCast(v, p->topfunc()->getReturnType(), "tmp"); @@ -1378,7 +1378,7 @@ static LLConstant* generate_unique_critical_section() { const LLType* Mty = DtoMutexType(); - return new llvm::GlobalVariable(*gIR->module, Mty, false, llvm::GlobalValue::InternalLinkage, gIR->context().getNullValue(Mty), ".uniqueCS"); + return new llvm::GlobalVariable(*gIR->module, Mty, false, llvm::GlobalValue::InternalLinkage, LLConstant::getNullValue(Mty), ".uniqueCS"); } void SynchronizedStatement::toIR(IRState* p)
--- a/gen/structs.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/structs.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -162,22 +162,22 @@ { if (is64 && diff % 8 == 0) { - values.push_back(gIR->context().getNullValue(llvm::Type::Int64Ty)); + values.push_back(LLConstant::getNullValue(llvm::Type::Int64Ty)); diff -= 8; } else if (diff % 4 == 0) { - values.push_back(gIR->context().getNullValue(llvm::Type::Int32Ty)); + values.push_back(LLConstant::getNullValue(llvm::Type::Int32Ty)); diff -= 4; } else if (diff % 2 == 0) { - values.push_back(gIR->context().getNullValue(llvm::Type::Int16Ty)); + values.push_back(LLConstant::getNullValue(llvm::Type::Int16Ty)); diff -= 2; } else { - values.push_back(gIR->context().getNullValue(llvm::Type::Int8Ty)); + values.push_back(LLConstant::getNullValue(llvm::Type::Int8Ty)); diff -= 1; } }
--- a/gen/todebug.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/todebug.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -19,7 +19,7 @@ using namespace llvm::dwarf; -#define DBG_NULL ( gIR->context().getNullValue(DBG_TYPE) ) +#define DBG_NULL ( LLConstant::getNullValue(DBG_TYPE) ) #define DBG_TYPE ( getPtrToType(llvm::StructType::get(NULL,NULL)) ) #define DBG_CAST(X) ( llvm::ConstantExpr::getBitCast(X, DBG_TYPE) ) @@ -297,7 +297,7 @@ std::vector<LLConstant*> initvals(11); initvals[0] = DBG_TAG(DW_TAG_structure_type); for (int i = 1; i < initvals.size(); ++i) - initvals[i] = gIR->context().getNullValue(getDwarfCompositeTypeType()->getContainedType(i)); + initvals[i] = LLConstant::getNullValue(getDwarfCompositeTypeType()->getContainedType(i)); gv->setInitializer(LLConstantStruct::get(getDwarfCompositeTypeType(), initvals)); ir->diCompositeType = llvm::DICompositeType(gv);
--- a/gen/toir.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/toir.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -341,7 +341,7 @@ return llvm::ConstantAggregateZero::get(t); } else { - return gIR->context().getNullValue(t); + return LLConstant::getNullValue(t); } assert(0); return NULL; @@ -1656,7 +1656,7 @@ LLValue* rval = dval->getRVal(); DtoDeleteMemory(rval); if (dval->isVar()) - DtoStore(gIR->context().getNullValue(rval->getType()), dval->getLVal()); + DtoStore(LLConstant::getNullValue(rval->getType()), dval->getLVal()); } // class else if (et->ty == Tclass) @@ -1680,7 +1680,7 @@ } if (dval->isVar()) { LLValue* lval = dval->getLVal(); - DtoStore(gIR->context().getNullValue(lval->getType()->getContainedType(0)), lval); + DtoStore(LLConstant::getNullValue(lval->getType()->getContainedType(0)), lval); } } // dyn array @@ -2547,7 +2547,7 @@ // it should be possible to avoid the temporary in some cases LLValue* tmp = DtoAlloca(type,"aaliteral"); DValue* aa = new DVarValue(type, tmp); - DtoStore(gIR->context().getNullValue(DtoType(type)), tmp); + DtoStore(LLConstant::getNullValue(DtoType(type)), tmp); const size_t n = keys->dim; for (size_t i=0; i<n; ++i)
--- a/gen/tollvm.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/tollvm.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -212,7 +212,7 @@ llvm::Value *b1, *b2; if (rhs == NULL) { - rhs = gIR->context().getNullValue(lhs->getType()); + rhs = LLConstant::getNullValue(lhs->getType()); } LLValue* l = gIR->ir->CreateExtractValue(lhs, 0); @@ -740,7 +740,7 @@ LLConstant* getNullValue(const LLType* t) { - return gIR->context().getNullValue(t); + return LLConstant::getNullValue(t); } //////////////////////////////////////////////////////////////////////////////////////////
--- a/gen/toobj.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/gen/toobj.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -557,7 +557,7 @@ // provide the default initializer const LLStructType* modulerefTy = DtoModuleReferenceType(); std::vector<LLConstant*> mrefvalues; - mrefvalues.push_back(gIR->context().getNullValue(modulerefTy->getContainedType(0))); + mrefvalues.push_back(LLConstant::getNullValue(modulerefTy->getContainedType(0))); mrefvalues.push_back(llvm::ConstantExpr::getBitCast(moduleinfo, modulerefTy->getContainedType(1))); LLConstant* thismrefinit = LLConstantStruct::get(modulerefTy, mrefvalues);
--- a/ir/irstruct.cpp Fri Jul 31 19:11:07 2009 +0200 +++ b/ir/irstruct.cpp Fri Jul 31 23:01:29 2009 +0200 @@ -117,22 +117,22 @@ { if (global.params.is64bit && diff % 8 == 0) { - constants.push_back(gIR->context().getNullValue(llvm::Type::Int64Ty)); + constants.push_back(LLConstant::getNullValue(llvm::Type::Int64Ty)); diff -= 8; } else if (diff % 4 == 0) { - constants.push_back(gIR->context().getNullValue(llvm::Type::Int32Ty)); + constants.push_back(LLConstant::getNullValue(llvm::Type::Int32Ty)); diff -= 4; } else if (diff % 2 == 0) { - constants.push_back(gIR->context().getNullValue(llvm::Type::Int16Ty)); + constants.push_back(LLConstant::getNullValue(llvm::Type::Int16Ty)); diff -= 2; } else { - constants.push_back(gIR->context().getNullValue(llvm::Type::Int8Ty)); + constants.push_back(LLConstant::getNullValue(llvm::Type::Int8Ty)); diff -= 1; } }