merge fix

dlang · Apr 9, 2011 · ef2a0f1 · ef2a0f1
2 parents 2393347 + 7d9c5c8
commit ef2a0f1
Show file tree

Hide file tree

Showing 4 changed files with 1,180 additions and 493 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -687,7 +687,7 @@ VarDeclaration::VarDeclaration(Loc loc, Type *type, Identifier *id, Initializer
     aliassym = NULL;
     onstack = 0;
     canassign = 0;
-    value = NULL;
+    setValueNull();
 }
 
 Dsymbol *VarDeclaration::syntaxCopy(Dsymbol *s)

diff --git a/src/declaration.h b/src/declaration.h
@@ -257,8 +257,18 @@ struct VarDeclaration : Declaration
                                 // 2: on stack, run destructor anyway
     int canassign;              // it can be assigned to
     Dsymbol *aliassym;          // if redone as alias to another symbol
-    Expression *value;          // when interpreting, this is the value
-                                // (NULL if value not determinable)
+
+    // When interpreting, these hold the value (NULL if value not determinable)
+    // The various functions are used only to detect compiler CTFE bugs
+    Expression *literalvalue;
+    Expression *getValue() { return literalvalue; }
+    void setValueNull();
+    void setValueWithoutChecking(Expression *newval);
+    void createRefValue(Expression *newval); // struct or array literal
+    void setRefValue(Expression *newval);
+    void setStackValue(Expression *newval);
+    void createStackValue(Expression *newval);
+
 #if DMDV2
     VarDeclaration *rundtor;    // if !NULL, rundtor is tested at runtime to see
                                 // if the destructor should be run. Used to prevent