Changeset 783

Timestamp:

12/06/10 05:18:33 (14 years ago)

Author:

walter

Message:

bugzilla 5230 Regression(2.041, 1.057) ICE(tocsym.c) overriding a method that has an out contract

Files:

• branches/dmd-1.x/src/func.c (modified) (1 diff)
• trunk/src/func.c (modified) (1 diff)

branches/dmd-1.x/src/func.c

@@ -1582 +1582 @@
-
-/****************************************************
- * Merge into this function the 'out' contracts of all it overrides.
- * 'out's are AND'd together, i.e. all of them need to pass.
- */
-
-Statement *FuncDeclaration::mergeFensure(Statement *sf)
-{
-    /* Same comments as for mergeFrequire(), except that we take care
-     * of generating a consistent reference to the 'result' local by
-     * explicitly passing 'result' to the nested function as a reference
-     * argument.
-     * This won't work for the 'this' parameter as it would require changing
-     * the semantic code for the nested function so that it looks on the parameter
-     * list for the 'this' pointer, something that would need an unknown amount
-     * of tweaking of various parts of the compiler that I'd rather leave alone.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-        FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
+
+        /* The semantic pass on the contracts of the overridden functions must
+         * be completed before code generation occurs (bug 3602 and 5230).
+         */
+        if (fdv->fdensure && fdv->fdensure->semanticRun != PASSsemantic3done)
+        {
+            assert(fdv->scope);
+            Scope *sc = fdv->scope->push();
+            sc->stc &= ~STCoverride;
+            fdv->semantic3(sc);
+            sc->pop();
+        }
+
-        sf = fdv->mergeFensure(sf);
-        if (fdv->fdensure)
-        {
-            //printf("fdv->fensure: %s\n", fdv->fensure->toChars());
-            // Make the call: __ensure(result)
-            Expression *eresult = NULL;
-            if (outId)
-                eresult = new IdentifierExp(loc, outId);
-            Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdensure), eresult);
-            Statement *s2 = new ExpStatement(loc, e);
-
-            if (sf)
-            {
-                sf = new CompoundStatement(fensure->loc, s2, sf);
-            }
-            else
-                sf = s2;
-        }
-    }
-    return sf;

trunk/src/func.c

@@ -1725 +1725 @@
-
-/****************************************************
- * Merge into this function the 'out' contracts of all it overrides.
- * 'out's are AND'd together, i.e. all of them need to pass.
- */
-
-Statement *FuncDeclaration::mergeFensure(Statement *sf)
-{
-    /* Same comments as for mergeFrequire(), except that we take care
-     * of generating a consistent reference to the 'result' local by
-     * explicitly passing 'result' to the nested function as a reference
-     * argument.
-     * This won't work for the 'this' parameter as it would require changing
-     * the semantic code for the nested function so that it looks on the parameter
-     * list for the 'this' pointer, something that would need an unknown amount
-     * of tweaking of various parts of the compiler that I'd rather leave alone.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-        FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
+
+        /* The semantic pass on the contracts of the overridden functions must
+         * be completed before code generation occurs (bug 3602 and 5230).
+         */
+        if (fdv->fdensure && fdv->fdensure->semanticRun != PASSsemantic3done)
+        {
+            assert(fdv->scope);
+            Scope *sc = fdv->scope->push();
+            sc->stc &= ~STCoverride;
+            fdv->semantic3(sc);
+            sc->pop();
+        }
+
-        sf = fdv->mergeFensure(sf);
-        if (fdv->fdensure)
-        {
-            //printf("fdv->fensure: %s\n", fdv->fensure->toChars());
-            // Make the call: __ensure(result)
-            Expression *eresult = NULL;
-            if (outId)
-                eresult = new IdentifierExp(loc, outId);
-            Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdensure, 0), eresult);
-            Statement *s2 = new ExpStatement(loc, e);
-
-            if (sf)
-            {
-                sf = new CompoundStatement(fensure->loc, s2, sf);
-            }
-            else
-                sf = s2;
-        }
-    }
-    return sf;