D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-28 09:33:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #239.

Browse Source
This commit is contained in:
Christian Kamm
2009-03-24 14:33:57 +01:00
parent 372b40dd94
commit eb1deec50d
2 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gen/toir.cpp
View File

@@ -1104,14 +1104,32 @@ DValue* DotVarExp::toElem(IRState* p)
LLValue* vthis = l->getRVal();
if (!vthis2) vthis2 = vthis;
// super call
if (e1->op == TOKsuper) {
//
// decide whether this function needs to be looked up in the vtable
//
bool vtbllookup = fdecl->isAbstract() || (!fdecl->isFinal() && fdecl->isVirtual());
// even virtual functions are looked up directly if super or DotTypeExp
// are used, thus we need to walk through the this expression and check
Expression* e = e1;
while (e && vtbllookup) {
if (e->op == TOKsuper || e->op == TOKdottype)
vtbllookup = false;
else if (e->op == TOKcast)
e = ((CastExp*)e)->e1;
else
break;
}
//
// look up function
//
if (!vtbllookup) {
DtoForceDeclareDsymbol(fdecl);
funcval = fdecl->ir.irFunc->func;
assert(funcval);
}
// normal virtual call
else if (fdecl->isAbstract() || (!fdecl->isFinal() && fdecl->isVirtual())) {
else {
assert(fdecl->vtblIndex > 0);
assert(e1type->ty == Tclass);
@@ -1131,12 +1149,7 @@ DValue* DotVarExp::toElem(IRState* p)
if (Logger::enabled())
Logger::cout() << "funcval casted: " << *funcval << '\n';
}
// static call
else {
DtoForceDeclareDsymbol(fdecl);
funcval = fdecl->ir.irFunc->func;
assert(funcval);
}
return new DFuncValue(fdecl, funcval, vthis2);
}
else {