Fix inferAggregate

dlang · Jan 21, 2013 · c16d6bd · c16d6bd
1 parent 460c512
commit c16d6bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/opover.c b/src/opover.c
@@ -1259,6 +1259,8 @@ int ForeachStatement::inferAggregate(Scope *sc, Dsymbol *&sapply)
     int sliced = 0;
 #endif
     Type *tab;
+    Type *att = NULL;
+    Expression *org_aggr = aggr;
     AggregateDeclaration *ad;
 
     while (1)
@@ -1270,6 +1272,10 @@ int ForeachStatement::inferAggregate(Scope *sc, Dsymbol *&sapply)
             goto Lerr;
 
         tab = aggr->type->toBasetype();
+        if (att == tab)
+        {   aggr = org_aggr;
+            goto Lerr;
+        }
         switch (tab->ty)
         {
             case Tarray:
@@ -1315,6 +1321,8 @@ int ForeachStatement::inferAggregate(Scope *sc, Dsymbol *&sapply)
 
                 if (ad->aliasthis)
                 {
+                    if (!att && tab->checkAliasThisRec())
+                        att = tab;
                     aggr = new DotIdExp(aggr->loc, aggr, ad->aliasthis->ident);
                     continue;
                 }

diff --git a/test/runnable/aliasthis.d b/test/runnable/aliasthis.d
@@ -330,6 +330,12 @@ void test7()
     static assert(!__traits(compiles, s0 += s3));   // e2
     static assert(!__traits(compiles, c1 += s1));   // e1 + e2
     static assert(!__traits(compiles, c3 += s3));   // e1 + e2
+
+    // ForeachStatement::inferAggregate
+    static assert(!__traits(compiles, { foreach (e; s1){} }));
+    static assert(!__traits(compiles, { foreach (e; s3){} }));
+    static assert(!__traits(compiles, { foreach (e; c1){} }));
+    static assert(!__traits(compiles, { foreach (e; c3){} }));
 }
 
 /***************************************************/