Changeset 640

Timestamp:

08/28/10 15:24:44 (1 year ago)

Author:

walter

Message:

Issue 4278 - allow inlining of super calls (undo limitations of bug3500's fix)

Files:

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

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

@@ -3069 +3069 @@
-            switch (ex->op)
-            {
-.member() calls directly
+(args) ctor calls
-                case TOKdottype:        // type.member() calls directly
-                    directcall = 1;

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

@@ -6185 +6185 @@
-     *  array.id(args) into id(array,args)
-     *  aa.remove(arg) into delete aa[arg]
+     *  super.id(args) into parent.id(args)
-     */
-    if (e1->op == TOKdot)
@@ -6223 +6224 @@
-                e1 = new IdentifierExp(dotid->loc, dotid->ident);
-#endif
+            }
+            else if (e1ty == Tclass && dotid->e1->op == TOKsuper)
+            {
+                // rewrite super.id into this.baseclass.id
+
+                FuncDeclaration *fd = hasThis(sc);
+
+                Dsymbol *s = fd->toParent();
+                while (s && s->isTemplateInstance())
+                    s = s->toParent();
+
+                ClassDeclaration *cd = s->isClassDeclaration();
+                Expression *dte = new DotTypeExp(dotid->loc, new ThisExp(dotid->loc), cd->baseClass);
+                e1 = new DotIdExp(dotid->loc, dte, dotid->ident);
-            }
-        }
@@ -6496 +6511 @@
-    else if (e1->op == TOKsuper)
-    {
+        // TODO: rewrite this to lower super(...) to baseclass(...) ?
-        // Base class constructor call
-        ClassDeclaration *cd = NULL;

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

@@ -282 +282 @@
-int CallExp::inlineCost(InlineCostState *ics)
-{
-    // Bugzilla 3500: super.func() calls must be devirtualized, and the inliner
-    // can't handle that at present.
-    if (e1->op == TOKdotvar && ((DotVarExp *)e1)->e1->op == TOKsuper)
-        return COST_MAX;
-
-    return 1 + e1->inlineCost(ics) + arrayInlineCost(ics, arguments);
-}

trunk/src/e2ir.c

@@ -3363 +3363 @@
-            switch (ex->op)
-            {
-.member() calls directly
+(args) ctor calls
-                case TOKdottype:        // type.member() calls directly
-                    directcall = 1;

trunk/src/expression.c

@@ -6526 +6526 @@
-     *  array.id(args) into .id(array,args)
-     *  aa.remove(arg) into delete aa[arg]
+     *  super.id(args) into parent.id(args)
-     */
-    if (e1->op == TOKdot)
@@ -6573 +6574 @@
-#endif
-            }
+            else if (e1ty == Tclass && dotid->e1->op == TOKsuper)
+            {
+                // rewrite super.id into this.baseclass.id
+
+                FuncDeclaration *fd = hasThis(sc);
+
+                Dsymbol *s = fd->toParent();
+                while (s && s->isTemplateInstance())
+                    s = s->toParent();
+
+                ClassDeclaration *cd = s->isClassDeclaration();
+                Expression *dte = new DotTypeExp(dotid->loc, new ThisExp(dotid->loc), cd->baseClass);
+                e1 = new DotIdExp(dotid->loc, dte, dotid->ident);
+            }
+
-         L2:
-            ;
@@ -6940 +6956 @@
-    else if (e1->op == TOKsuper)
-    {
+        // TODO: rewrite this to lower super(...) to baseclass(...) ?
-        // Base class constructor call
-        ClassDeclaration *cd = NULL;

trunk/src/inline.c

@@ -283 +283 @@
-int CallExp::inlineCost(InlineCostState *ics)
-{
-    // Bugzilla 3500: super.func() calls must be devirtualized, and the inliner
-    // can't handle that at present.
-    if (e1->op == TOKdotvar && ((DotVarExp *)e1)->e1->op == TOKsuper)
-        return COST_MAX;
-
-    return 1 + e1->inlineCost(ics) + arrayInlineCost(ics, arguments);
-}