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

Fix #138 – in precondition of methods broken in D1.

Browse source 
Not sure why the code was special-cased for D2 in the first place –
are there any cases where we expect a »full« context struct in the
contracts for D1. At least, they don't occur in DStress/Tango/….

As a general note, this is one of many bugs which would have not gone
unnoticed if we didn't use so many bitcasts.
This commit is contained in:
David Nadlinger 2012-07-13 11:38:56 +02:00
parent 67fd824543
commit f7e5245e03
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gen/tocall.cpp
View file

@ -392,24 +392,26 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
// then comes a context argument... // then comes a context argument...
if(thiscall || delegatecall || nestedcall) if(thiscall || delegatecall || nestedcall)
{ {
#if DMDV2 if (dfnval && (dfnval->func->ident == Id::ensure ||
if (dfnval && (dfnval->func->ident == Id::ensure || dfnval->func->ident == Id::require)) { dfnval->func->ident == Id::require))
{
// ... which can be the this "context" argument for a contract
// invocation (we do not generate a full nested context struct for
// these)
LLValue* thisarg = DtoBitCast(DtoLoad(gIR->func()->thisArg), getVoidPtrType()); LLValue* thisarg = DtoBitCast(DtoLoad(gIR->func()->thisArg), getVoidPtrType());
++argiter; ++argiter;
args.push_back(thisarg); args.push_back(thisarg);
} }
else else if (thiscall && dfnval && dfnval->vthis)
#endif
// ... which can be a 'this' argument
if (thiscall && dfnval && dfnval->vthis)
{ {
// ... or a normal 'this' argument
LLValue* thisarg = DtoBitCast(dfnval->vthis, *argiter); LLValue* thisarg = DtoBitCast(dfnval->vthis, *argiter);
++argiter; ++argiter;
args.push_back(thisarg); args.push_back(thisarg);
} }
// ... or a delegate context arg
else if (delegatecall) else if (delegatecall)
{ {
// ... or a delegate context arg
LLValue* ctxarg; LLValue* ctxarg;
if (fnval->isLVal()) if (fnval->isLVal())
{ {
@ -423,9 +425,9 @@ DValue* DtoCallFunction(Loc& loc, Type* resulttype, DValue* fnval, Expressions*
++argiter; ++argiter;
args.push_back(ctxarg); args.push_back(ctxarg);
} }
// ... or a nested function context arg
else if (nestedcall) else if (nestedcall)
{ {
/// ... or a nested function context arg
if (dfnval) { if (dfnval) {
LLValue* contextptr = DtoNestedContext(loc, dfnval->func); LLValue* contextptr = DtoNestedContext(loc, dfnval->func);
contextptr = DtoBitCast(contextptr, getVoidPtrType()); contextptr = DtoBitCast(contextptr, getVoidPtrType());