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

[svn r390] Make the zero value used when no nested context was created of the correct type.

Browse source 
Fixes run/class_06.
This commit is contained in:
Christian Kamm 2008-07-15 08:44:08 +02:00
parent 5b9edddb9d
commit e69f92b613
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/classes.cpp
View file

@ -827,6 +827,9 @@ DValue* DtoNewClass(TypeClass* tc, NewExp* newexp)
{
Logger::println("Resolving nested context");
LOG_SCOPE;
LLValue* gep = DtoGEPi(mem,0,2,"tmp");
// this value might be zero if it was not necessary to generate it ...
LLValue* nest = gIR->func()->nestedVar;
// ... then revert to the this ptr if there is one
@ -834,10 +837,9 @@ DValue* DtoNewClass(TypeClass* tc, NewExp* newexp)
nest = gIR->func()->thisVar;
// ... or just use zero, since it must be unused.
if (!nest)
nest = llvm::ConstantPointerNull::get(getVoidPtrType());
assert(nest);
LLValue* gep = DtoGEPi(mem,0,2,"tmp");
nest = DtoBitCast(nest, gep->getType()->getContainedType(0));
nest = llvm::Constant::getNullValue(gep->getType()->getContainedType(0));
else
nest = DtoBitCast(nest, gep->getType()->getContainedType(0));
DtoStore(nest, gep);
}