Merge pull request #2126 from donc/ctfe_10251pointerglobal

10251 CTFE returning pointers to global statics of known value
dlang · Jun 5, 2013 · 4984910 · 4984910
2 parents 0ec66ad + c991a71
commit 4984910
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -1547,12 +1547,6 @@ Expression *SymOffExp::interpret(InterState *istate, CtfeGoal goal)
     if ( var->isDataseg() && (
          (offset == 0 && isSafePointerCast(var->type, pointee)) ||
          (fromType && isSafePointerCast(fromType, pointee))
-        ) && !(vd && vd->init &&
-#if DMDV2
-        (var->isConst() || var->isImmutable())
-#else
-        var>isConst()
-#endif
         ))
     {
         return this;

diff --git a/test/compilable/interpret3.d b/test/compilable/interpret3.d
@@ -2410,6 +2410,19 @@ bool test9745b()
 }
 static assert(test9745b());
 
+/**************************************************
+    10251 Pointers to const globals
+**************************************************/
+
+static const int glob10251 = 7;
+
+const (int) * bug10251()
+{
+   return &glob10251;
+}
+
+static a10251 = &glob10251; //  OK
+static b10251 = bug10251();
 
 /**************************************************
     4065 [CTFE] AA "in" operator doesn't work