src/declaration.d

@@ -2275,6 +2275,9 @@ public:
     override final Dsymbol toAlias()
     {
         //printf("VarDeclaration::toAlias('%s', this = %p, aliassym = %p)\n", toChars(), this, aliassym);
+        if ((!type || !type.deco) && _scope)
+            semantic(_scope);
+
         assert(this != aliassym);
         Dsymbol s = aliassym ? aliassym.toAlias() : this;
         return s;

src/dsymbol.d

@@ -512,6 +512,7 @@ public:
     /*********************************
      * If this symbol is really an alias for another,
      * return that other.
+     * If needed, semantic() is invoked due to resolve forward reference.
      */
     Dsymbol toAlias()
     {

src/expression.d

@@ -3715,36 +3715,15 @@ public:
         {
             if (!s.isFuncDeclaration()) // functions are checked after overloading
                 s.checkDeprecated(loc, sc);
+
+            // Bugzilla 12023: if 's' is a tuple variable, the tuple is returned.
             s = s.toAlias();
+
             //printf("s = '%s', s->kind = '%s', s->needThis() = %p\n", s->toChars(), s->kind(), s->needThis());
             if (s != olds && !s.isFuncDeclaration())
                 s.checkDeprecated(loc, sc);
         }
-        if (VarDeclaration v = s.isVarDeclaration())
-        {
-            /* Bugzilla 12023: forward reference should be resolved
-             * before 's->needThis()' is called.
-             */
-            if ((!v.type || !v.type.deco) && v._scope)
-            {
-                v.semantic(v._scope);
-                s = v.toAlias(); // Need this if 'v' is a tuple variable
-            }
-            // Change the ancestor lambdas to delegate before hasThis(sc) call.
-            if (v.checkNestedReference(sc, loc))
-                return new ErrorExp();
-        }
-        if (s.needThis() && hasThis(sc))
-        {
-            // For functions, this should happen after overload resolution
-            if (!s.isFuncDeclaration())
-            {
-                // Supply an implicit 'this', as in
-                //    this.ident
-                auto de = new DotVarExp(loc, new ThisExp(loc), s.isDeclaration());
-                return de.semantic(sc);
-            }
-        }
+
         if (EnumMember em = s.isEnumMember())
         {
             return em.getVarExp(loc, sc);
@@ -3770,10 +3749,17 @@ public:
                 v.inuse--;
                 return e;
             }
-            e = new VarExp(loc, v);
-            e.type = v.type;
+
+            // Change the ancestor lambdas to delegate before hasThis(sc) call.
+            if (v.checkNestedReference(sc, loc))
+                return new ErrorExp();
+
+            if (v.needThis() && hasThis(sc))
+                e = new DotVarExp(loc, new ThisExp(loc), v);
+            else
+                e = new VarExp(loc, v);
             e = e.semantic(sc);
-            return e.deref();
+            return e;
         }
         if (FuncLiteralDeclaration fld = s.isFuncLiteralDeclaration())
         {
@@ -3839,7 +3825,10 @@ public:
         }
         if (TupleDeclaration tup = s.isTupleDeclaration())
         {
-            e = new TupleExp(loc, tup);
+            if (tup.needThis() && hasThis(sc))
+                e = new DotVarExp(loc, new ThisExp(loc), tup);
+            else
+                e = new TupleExp(loc, tup);
             e = e.semantic(sc);
             return e;
         }
@@ -5275,9 +5264,6 @@ public:
 
             if (auto v = s.isVarDeclaration())
             {
-                if ((!v.type || !v.type.deco) && v._scope)
-                    v.semantic(v._scope);
-
                 if (!v.type)
                 {
                     error("forward reference of %s %s", v.kind(), v.toChars());
@@ -7950,8 +7936,12 @@ public:
                  */
                 if (Declaration d = s.isDeclaration())
                     checkAccess(loc, sc, null, d);
+
+                // if 's' is a tuple variable, the tuple is returned.
                 s = s.toAlias();
+
                 checkDeprecated(sc, s);
+
                 EnumMember em = s.isEnumMember();
                 if (em)
                 {
@@ -7966,7 +7956,6 @@ public:
                         error("circular reference to '%s'", v.toChars());
                         return new ErrorExp();
                     }
-                    type = v.type;
                     if (v.needThis())
                     {
                         if (!eleft)

test/compilable/ice11300.d

@@ -0,0 +1,5 @@
+// PERMUTE_ARGS:
+
+module ice11300;
+import imports.ice11300a;
+enum value = 42;