[Refactoring] Remove use of Expression::addressOf in glue layer

dlang · Feb 23, 2014 · 83b7ba1 · 83b7ba1
1 parent 6c0cfcf
commit 83b7ba1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/src/e2ir.c b/src/e2ir.c
@@ -188,10 +188,9 @@ elem *callfunc(Loc loc,
 
                 if (p->storageClass & (STCout | STCref))
                 {
-                    // Convert argument to a pointer,
-                    // use AddrExp::toElem()
-                    Expression *ae = arg->addressOf();
-                    ea = ae->toElem(irs);
+                    // Convert argument to a pointer
+                    ea = arg->toElem(irs);
+                    ea = addressElem(ea, arg->type->pointerTo());
                     goto L1;
                 }
             }

diff --git a/src/expression.c b/src/expression.c
@@ -2458,19 +2458,7 @@ Expression *Expression::addressOf()
 {
     //printf("Expression::addressOf()\n");
 #ifdef DEBUG
-    {
-        Expression *e = this;
-        while (e->op == TOKcomma)
-            e = ((CommaExp *)e)->e2;
-
-        /* VarExp::isLvalue() returns false if the variable has STCtemp.
-         * However in glue layer, a variable with STCtemp is address-able.
-         * So currently we cannot directly use e->isLvalue().
-         */
-        assert(e->op == TOKvar && ((VarExp *)e)->var->isVarDeclaration() ||
-               e->op == TOKerror ||
-               e->isLvalue());
-    }
+    assert(op == TOKerror || isLvalue());
 #endif
     Expression *e = new AddrExp(loc, this);
     e->type = type->pointerTo();

diff --git a/src/s2ir.c b/src/s2ir.c
@@ -796,8 +796,8 @@ class S2irVisitor : public Visitor
             else if (tf->isref)
             {
                 // Reference return, so convert to a pointer
-                Expression *ae = s->exp->addressOf();
-                e = toElemDtor(ae, irs);
+                e = toElemDtor(s->exp, irs);
+                e = addressElem(e, s->exp->type->pointerTo());
             }
             else
             {