comparison dmd/optimize.c @ 1499:df11cdec45a2

Another shot at fixing the issues with (constant) struct literals and their addresses. See DMD2682, #218, #324. The idea is to separate the notion of const from 'this variable can always be replaced with its initializer' in the frontend. To do that, I introduced Declaration::isSameAsInitializer, which is overridden in VarDeclaration to return false for constants that have a struct literal initializer. So {{{ const S s = S(5); void foo() { auto ps = &s; } // is no longer replaced by void foo() { auto ps = &(S(5)); } }}} To make taking the address of a struct constant with a struct-initializer outside of function scope possible, I made sure that AddrExp::optimize doesn't try to run the argument's optimization with WANTinterpret - that'd again replace the constant with a struct literal temporary.
author Christian Kamm <kamm incasoftware de>
date Sun, 14 Jun 2009 19:49:58 +0200
parents 8026319762be
children def7a1d494fd
comparison
equal deleted inserted replaced
1498:899a928ac905 1499:df11cdec45a2
192 192
193 Expression *AddrExp::optimize(int result) 193 Expression *AddrExp::optimize(int result)
194 { Expression *e; 194 { Expression *e;
195 195
196 //printf("AddrExp::optimize(result = %d) %s\n", result, toChars()); 196 //printf("AddrExp::optimize(result = %d) %s\n", result, toChars());
197 e1 = e1->optimize(result); 197 // never try to interpret: it could change the semantics by turning
198 // const p = &s; into an something like const p = &(Struct());
199 e1 = e1->optimize(result & ~WANTinterpret);
198 // Convert &*ex to ex 200 // Convert &*ex to ex
199 if (e1->op == TOKstar) 201 if (e1->op == TOKstar)
200 { Expression *ex; 202 { Expression *ex;
201 203
202 ex = ((PtrExp *)e1)->e1; 204 ex = ((PtrExp *)e1)->e1;