fix Issue 15117 - Unreasonable circular reference error via named mixin

dlang · Mar 28, 2016 · 3c70f27 · 3c70f27
1 parent b51fecf
commit 3c70f27
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/expression.d b/src/expression.d
@@ -8367,9 +8367,12 @@ public:
                 if (v)
                 {
                     //printf("DotIdExp:: Identifier '%s' is a variable, type '%s'\n", toChars(), v->type->toChars());
-                    if (v.inuse)
+                    if (!v.type)
                     {
-                        error("circular reference to '%s'", v.toChars());
+                        if (v.inuse)
+                            error("circular reference to '%s'", v.toChars());
+                        else
+                            error("forward reference of %s %s", s.kind(), s.toChars());
                         return new ErrorExp();
                     }
                     if (v.needThis())

diff --git a/test/fail_compilation/fail89.d b/test/fail_compilation/fail89.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail89.d(9): Error: circular reference to 'a'
+fail_compilation/fail89.d(9): Error: circular initialization of a
 ---
 */
 

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -7681,6 +7681,21 @@ void test15116()
     auto x2 = s.mix.tup;    // OK <- NG
 }
 
+/***************************************************/
+// 15117
+
+template Mix15117()
+{
+    int y = { typeof(this)* s; return s ? s.mix.y : 0; }();
+}
+
+struct S15117
+{
+    int x = { typeof(this)* s; return s ? s.x : 0; }(); // OK
+
+    mixin Mix15117 mix;     // OK <- NG
+}
+
 /***************************************************/
 // 15126