D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-08-02 04:20:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[svn r147] tango.io.Console is now working. True this time :) Yay!

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-01-25 01:42:36 +01:00
parent be7828b589
commit adc75dd377
5 changed files with 38 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gen/toir.cpp
View File

@@ -2173,19 +2173,20 @@ DValue* DelegateExp::toElem(IRState* p)
Logger::print("DelegateExp::toElem: %s | %s\n", toChars(), type->toChars());
LOG_SCOPE;
DValue* u = e1->toElem(p);
const llvm::PointerType* int8ptrty = getPtrToType(llvm::Type::Int8Ty);
llvm::Value* lval;
bool inplace = false;
if (p->topexp() && p->topexp()->e2 == this) {
assert(p->topexp()->v);
lval = p->topexp()->v->getLVal();
inplace = true;
}
else {
lval = new llvm::AllocaInst(DtoType(type), "tmpdelegate", p->topallocapoint());
}
DValue* u = e1->toElem(p);
llvm::Value* uval;
if (DFuncValue* f = u->isFunc()) {
//assert(f->vthis);
@@ -2197,9 +2198,21 @@ DValue* DelegateExp::toElem(IRState* p)
uval = llvm::ConstantPointerNull::get(int8ptrty);
}
else {
uval = u->getRVal();
DValue* src = u;
if (ClassDeclaration* cd = u->getType()->isClassHandle())
{
Logger::println("context type is class handle");
if (cd->isInterfaceDeclaration())
{
Logger::println("context type is interface");
src = DtoCastInterfaceToObject(u, ClassDeclaration::object->type);
}
}
uval = src->getRVal();
}
Logger::cout() << "context = " << *uval << '\n';
llvm::Value* context = DtoGEPi(lval,0,0,"tmp");
llvm::Value* castcontext = DtoBitCast(uval, int8ptrty);
DtoStore(castcontext, context);
@@ -2221,7 +2234,7 @@ DValue* DelegateExp::toElem(IRState* p)
castfptr = DtoBitCast(castfptr, fptr->getType()->getContainedType(0));
DtoStore(castfptr, fptr);
return new DVarValue(type, lval, true);
return new DImValue(type, lval, inplace);
}
//////////////////////////////////////////////////////////////////////////////////////////