Changeset 824

Timestamp:

12/28/10 01:59:22 (14 years ago)

Author:

walter

Message:

mitigation of bugzilla 4860

Files:

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

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

@@ -3123 +3123 @@
-            directcall = 1;
-
-        if (!func->isThis())
-            error("delegates are only for non-static functions");
-
-        if (!func->isVirtual() ||
-            directcall ||
-            func->isFinal())
-        {
-            ep = el_ptr(sfunc);
-        }
-        else
-        {
-            // Get pointer to function out of virtual table
-            unsigned vindex;
-
-            assert(ethis);
-            ep = el_same(&ethis);
-            ep = el_una(OPind, TYnptr, ep);
-            vindex = func->vtblIndex;
+
+            if ((int)vindex < 0)
+                error("Internal compiler error: malformed delegate. See Bugzilla 4860");
-
-            // Build *(ep + vindex * 4)
-            ep = el_bin(OPadd,TYnptr,ep,el_long(TYsize_t, vindex * PTRSIZE));
-            ep = el_una(OPind,TYnptr,ep);
-        }
-
-//      if (func->tintro)
-//          func->error(loc, "cannot form delegate due to covariant return type");
-    }
-    if (ethis->Eoper == OPcomma)
-    {
-        ethis->E2 = el_pair(TYdarray, ethis->E2, ep);
-        ethis->Ety = TYdarray;
-        e = ethis;
-    }
-    else
-        e = el_pair(TYdarray, ethis, ep);
-    el_setLoc(e,loc);
-    return e;
-}

trunk/src/e2ir.c

@@ -3327 +3327 @@
-            directcall = 1;
-
-        if (!func->isThis())
-            error("delegates are only for non-static functions");
-
-        if (!func->isVirtual() ||
-            directcall ||
-            func->isFinal())
-        {
-            ep = el_ptr(sfunc);
-        }
-        else
-        {
-            // Get pointer to function out of virtual table
-            unsigned vindex;
-
-            assert(ethis);
-            ep = el_same(&ethis);
-            ep = el_una(OPind, TYnptr, ep);
-            vindex = func->vtblIndex;
+
+            if ((int)vindex < 0)
+                error("Internal compiler error: malformed delegate. See Bugzilla 4860");
-
-            // Build *(ep + vindex * 4)
-            ep = el_bin(OPadd,TYnptr,ep,el_long(TYsize_t, vindex * PTRSIZE));
-            ep = el_una(OPind,TYnptr,ep);
-        }
-
-//      if (func->tintro)
-//          func->error(loc, "cannot form delegate due to covariant return type");
-    }
-    if (ethis->Eoper == OPcomma)
-    {
-        ethis->E2 = el_pair(TYdelegate, ethis->E2, ep);
-        ethis->Ety = TYdelegate;
-        e = ethis;
-    }
-    else
-        e = el_pair(TYdelegate, ethis, ep);
-    el_setLoc(e,loc);
-    return e;
-}