Merge pull request #4657 from yebblies/TypeidExp

[refactor] Create typeid() expressions instead of invoking getTypeInfo directly
dlang · May 17, 2015 · 895eb9c · 895eb9c
2 parents 191fee6 + e2995f5
commit 895eb9c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 47 deletions.
diff --git a/src/clone.c b/src/clone.c
@@ -25,8 +25,6 @@
 #include "template.h"
 #include "tokens.h"
 
-Expression *getTypeInfo(Type *t, Scope *sc);
-
 /*******************************************
  * Merge function attributes pure, nothrow, @safe, @nogc, and @disable
  */
@@ -828,11 +826,11 @@ FuncDeclaration *buildPostBlit(StructDeclaration *sd, Scope *sc)
         }
         else
         {
-            // Typeinfo.postblit(cast(void*)&this.v);
+            // typeid(typeof(v)).postblit(cast(void*)&this.v);
             Expression *ea = new AddrExp(loc, ex);
             ea = new CastExp(loc, ea, Type::tvoid->pointerTo());
 
-            Expression *et = getTypeInfo(v->type, sc);
+            Expression *et = new TypeidExp(loc, v->type);
             et = new DotIdExp(loc, et, Identifier::idPool("postblit"));
             ex = new CallExp(loc, et, ea);
         }
@@ -857,7 +855,7 @@ FuncDeclaration *buildPostBlit(StructDeclaration *sd, Scope *sc)
             Expression *ea = new AddrExp(loc, ex);
             ea = new CastExp(loc, ea, Type::tvoid->pointerTo());
 
-            Expression *et = getTypeInfo(v->type, sc);
+            Expression *et = new TypeidExp(loc, v->type);
             et = new DotIdExp(loc, et, Id::destroy);
             ex = new CallExp(loc, et, ea);
         }
@@ -969,7 +967,7 @@ FuncDeclaration *buildDtor(AggregateDeclaration *ad, Scope *sc)
             Expression *ea = new AddrExp(loc, ex);
             ea = new CastExp(loc, ea, Type::tvoid->pointerTo());
 
-            Expression *et = getTypeInfo(v->type, sc);
+            Expression *et = new TypeidExp(loc, v->type);
             et = new DotIdExp(loc, et, Id::destroy);
             ex = new CallExp(loc, et, ea);
         }

diff --git a/src/declaration.c b/src/declaration.c
@@ -27,8 +27,6 @@
 #include "ctfe.h"
 #include "target.h"
 
-Expression *getTypeInfo(Type *t, Scope *sc);
-
 /************************************
  * Check to see the aggregate type is nested and its context pointer is
  * accessible from the current scope.
@@ -2048,7 +2046,7 @@ Expression *VarDeclaration::callScopeDtor(Scope *sc)
                 Expressions *args = new Expressions();
                 args->push(ea);
 
-                Expression *et = getTypeInfo(type, sc);
+                Expression *et = new TypeidExp(loc, type);
                 et = new DotIdExp(loc, et, Id::destroy);
 
                 e = new CallExp(loc, et, args);

diff --git a/src/expression.c b/src/expression.c
@@ -44,7 +44,6 @@
 
 bool typeMerge(Scope *sc, TOK op, Type **pt, Expression **pe1, Expression **pe2);
 bool isArrayOpValid(Expression *e);
-Expression *createTypeInfoArray(Scope *sc, Expression *args[], size_t dim);
 Expression *expandVar(int result, VarDeclaration *v);
 TypeTuple *toArgTypes(Type *t);
 bool checkFrameAccess(Loc loc, Scope *sc, AggregateDeclaration *ad, size_t istart = 0);
@@ -1912,8 +1911,18 @@ bool functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
     if (tf->linkage == LINKd && tf->varargs == 1)
     {
         assert(arguments->dim >= nparams);
-        Expression *e = createTypeInfoArray(sc, (Expression **)&arguments->tdata()[nparams],
-                arguments->dim - nparams);
+
+        Parameters *args = new Parameters;
+        args->setDim(arguments->dim - nparams);
+        for (size_t i = 0; i < arguments->dim - nparams; i++)
+        {
+            Parameter *arg = new Parameter(STCin, (*arguments)[nparams + i]->type, NULL, NULL);
+            (*args)[i] = arg;
+        }
+
+        TypeTuple *tup = new TypeTuple(args);
+        Expression *e = new TypeidExp(loc, tup);
+        e = e->semantic(sc);
         arguments->insert(0, e);
     }
 
@@ -14141,32 +14150,3 @@ Expression *BinExp::reorderSettingAAElem(Scope *sc)
     //printf("-de = %s, be = %s\n", de->toChars(), be->toChars());
     return Expression::combine(de, be);
 }
-
-/***************************************
- * Create a static array of TypeInfo references
- * corresponding to an array of Expression's.
- * Used to supply hidden _arguments[] value for variadic D functions.
- */
-
-Expression *createTypeInfoArray(Scope *sc, Expression *exps[], size_t dim)
-{
-    /*
-     * Pass a reference to the TypeInfo_Tuple corresponding to the types of the
-     * arguments. Source compatibility is maintained by computing _arguments[]
-     * at the start of the called function by offseting into the TypeInfo_Tuple
-     * reference.
-     */
-    Parameters *args = new Parameters;
-    args->setDim(dim);
-    for (size_t i = 0; i < dim; i++)
-    {
-        Parameter *arg = new Parameter(STCin, exps[i]->type, NULL, NULL);
-        (*args)[i] = arg;
-    }
-    TypeTuple *tup = new TypeTuple(args);
-    Expression *e = getTypeInfo(tup, sc);
-    e = e->optimize(WANTvalue);
-    assert(e->op == TOKsymoff);         // should be SymOffExp
-
-    return e;
-}
diff --git a/src/magicport.json b/src/magicport.json
@@ -445,7 +445,6 @@
             [
                 "aggregate",
                 "arraytypes",
-                "backend",
                 "declaration",
                 "dscope",
                 "dstruct",
@@ -1506,7 +1505,6 @@
                 "aggregate",
                 "arraytypes",
                 "attrib",
-                "backend",
                 "core.stdc.stdio",
                 "cppmangle",
                 "ctfeexpr",
@@ -2845,8 +2843,7 @@
                 "struct LineInitExp",
                 "struct ModuleInitExp",
                 "struct FuncInitExp",
-                "struct PrettyFuncInitExp",
-                "function createTypeInfoArray"
+                "struct PrettyFuncInitExp"
             ]
         },
         {

diff --git a/src/mtype.c b/src/mtype.c
@@ -55,7 +55,6 @@ int Tsize_t = Tuns32;
 int Tptrdiff_t = Tint32;
 
 Symbol *toInitializer(AggregateDeclaration *ad);
-Expression *getTypeInfo(Type *t, Scope *sc);
 
 /***************************** Type *****************************/
 
@@ -3787,7 +3786,9 @@ Expression *TypeArray::dotExp(Scope *sc, Expression *e, Identifier *ident, int f
         arguments = new Expressions();
         arguments->push(e);
         // don't convert to dynamic array
-        arguments->push(getTypeInfo(n, sc));
+        Expression *tid = new TypeidExp(e->loc, n);
+        tid = tid->semantic(sc);
+        arguments->push(tid);
         e = new CallExp(e->loc, ec, arguments);
         e->type = next->arrayOf();
     }