fix Issue 17660 - ICE with : AssertError@ddmd/visitor.d(39)

dlang · Jul 17, 2017 · 425f129 · 425f129
1 parent dd6285d
commit 425f129
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 30 deletions.
diff --git a/src/ddmd/dinterpret.d b/src/ddmd/dinterpret.d
@@ -415,12 +415,6 @@ public:
             ctfeCompile(s.statement);
     }
 
-    override void visit(ForwardingStatement s)
-    {
-        assert(!!s.statement);
-        s.statement.accept(this);
-    }
-
     override void visit(OnScopeStatement s)
     {
         debug (LOGCOMPILE)
@@ -1244,12 +1238,6 @@ public:
         result = interpret(s.statement, istate);
     }
 
-    override void visit(ForwardingStatement s)
-    {
-        assert(!!s.statement);
-        s.statement.accept(this);
-    }
-
     /**
      Given an expression e which is about to be returned from the current
      function, generate an error if it contains pointers to local variables.

diff --git a/src/ddmd/hdrgen.d b/src/ddmd/hdrgen.d
@@ -189,14 +189,6 @@ public:
         buf.writenl();
     }
 
-    override void visit(ForwardingStatement s)
-    {
-        if (s.statement)
-        {
-            s.statement.accept(this);
-        }
-    }
-
     override void visit(WhileStatement s)
     {
         buf.writestring("while (");

diff --git a/src/ddmd/s2ir.d b/src/ddmd/s2ir.d
@@ -980,15 +980,6 @@ extern (C++) class S2irVisitor : Visitor
         }
     }
 
-    /***************************************
-     */
-
-    override void visit(ForwardingStatement s)
-    {
-        assert(!!s.statement);
-        s.statement.accept(this);
-    }
-
     /***************************************
      */
 

diff --git a/src/ddmd/visitor.d b/src/ddmd/visitor.d
@@ -86,7 +86,10 @@ extern (C++) class Visitor
 
     void visit(ForwardingStatement s)
     {
-        visit(cast(Statement)s);
+        if (s.statement)
+        {
+            s.statement.accept(this);
+        }
     }
 
     void visit(WhileStatement s)

diff --git a/test/compilable/staticforeach.d b/test/compilable/staticforeach.d
@@ -632,3 +632,9 @@ void testEmpty(){
     static foreach(i;0..0) { }
 }
 
+auto bug17660(){
+    int x;
+    static foreach (i; 0 .. 1) { return 3; }
+    return x;
+}
+static assert(bug17660()==3);