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

Constant fold structliteral.member again.

Browse Source
This commit is contained in:
Christian Kamm
2008-09-12 12:39:06 +02:00
parent bba1994b05
commit f0abdf860a
3 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dmd/expression.h
View File

@@ -825,6 +825,11 @@ struct DotVarExp : UnaExp
void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
void dump(int indent);
elem *toElem(IRState *irs);
//LLVMDC: since we don't convert abc.def -> *(&abc + ABC.def.offsetof)
// these are needed
Expression *optimize(int result);
Expression *interpret(InterState *istate);
};
struct DotTemplateInstanceExp : UnaExp

21
dmd/interpret.c
View File

@@ -2157,6 +2157,27 @@ Expression *PtrExp::interpret(InterState *istate)
return e;
}
Expression *DotVarExp::interpret(InterState *istate)
{ Expression *e = EXP_CANT_INTERPRET;
Expression *ex = e1->interpret(istate);
// Constant fold structliteral.member
if (ex != EXP_CANT_INTERPRET && ex->op == TOKstructliteral)
{ StructLiteralExp *se = (StructLiteralExp *)ex;
VarDeclaration* v;
if (v = var->isVarDeclaration())
{
e = se->getField(type, v->offset);
if (!e)
e = EXP_CANT_INTERPRET;
}
}
return e;
}
/******************************* Special Functions ***************************/
Expression *interpret_aaLen(InterState *istate, Expressions *arguments)

21
dmd/optimize.c
View File

@@ -276,6 +276,27 @@ Expression *PtrExp::optimize(int result)
return this;
}
Expression *DotVarExp::optimize(int result)
{
e1 = e1->optimize(result);
// Constant fold structliteral.member
if (e1->op == TOKstructliteral)
{ StructLiteralExp *se = (StructLiteralExp *)e1;
VarDeclaration* v;
if (v = var->isVarDeclaration())
{
Expression *e = se->getField(type, v->offset);
if (!e)
e = EXP_CANT_INTERPRET;
return e;
}
}
return this;
}
Expression *CallExp::optimize(int result)
{ Expression *e = this;