Changeset 782

Timestamp:

12/06/10 00:30:59 (14 years ago)

Author:

walter

Message:

bugzilla 5145 Regression(2.050, 1.065) override error with forward ref of superclass

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

@@ -1532 +1532 @@
-     * place by definition, since it's an overriding function. The problem is
-     * getting the 'this' pointer in the same place, since it is a local variable.
-     * We did some hacks in the code generator to make this happen:
-     *  1. always generate exception handler frame, or at least leave space for it
-     *     in the frame (Windows 32 SEH only)
-     *  2. always generate an EBP style frame
-     *  3. since 'this' is passed in a register that is subsequently copied into
-     *     a stack local, allocate that local immediately following the exception
-     *     handler block, so it is always at the same offset from EBP.
-     */
-    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).
-         */
-        if (fdv->fdrequire && fdv->fdrequire->semanticRun != PASSsemantic3done)
-        {
-            assert(fdv->scope);
-
+
+
+
+
-        }
-
-        sf = fdv->mergeFrequire(sf);
-        if (fdv->fdrequire)
-        {
-            //printf("fdv->frequire: %s\n", fdv->frequire->toChars());
-            /* Make the call:
-             *   try { __require(); }
-             *   catch { frequire; }
-             */
-            Expression *eresult = NULL;
-            Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdrequire), eresult);
-            Statement *s2 = new ExpStatement(loc, e);
-
-            if (sf)
-            {   Catch *c = new Catch(loc, NULL, NULL, sf);
-                Array *catches = new Array();
-                catches->push(c);
-                sf = new TryCatchStatement(loc, s2, catches);
-            }

trunk/src/func.c

@@ -1675 +1675 @@
-     * place by definition, since it's an overriding function. The problem is
-     * getting the 'this' pointer in the same place, since it is a local variable.
-     * We did some hacks in the code generator to make this happen:
-     *  1. always generate exception handler frame, or at least leave space for it
-     *     in the frame (Windows 32 SEH only)
-     *  2. always generate an EBP style frame
-     *  3. since 'this' is passed in a register that is subsequently copied into
-     *     a stack local, allocate that local immediately following the exception
-     *     handler block, so it is always at the same offset from EBP.
-     */
-    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).
-         */
-        if (fdv->fdrequire && fdv->fdrequire->semanticRun != PASSsemantic3done)
-        {
-            assert(fdv->scope);
-
+
+
+
+
-        }
-
-        sf = fdv->mergeFrequire(sf);
-        if (fdv->fdrequire)
-        {
-            //printf("fdv->frequire: %s\n", fdv->frequire->toChars());
-            /* Make the call:
-             *   try { __require(); }
-             *   catch { frequire; }
-             */
-            Expression *eresult = NULL;
-            Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdrequire, 0), eresult);
-            Statement *s2 = new ExpStatement(loc, e);
-
-            if (sf)
-            {   Catch *c = new Catch(loc, NULL, NULL, sf);
-                Array *catches = new Array();
-                catches->push(c);
-                sf = new TryCatchStatement(loc, s2, catches);
-            }