Changeset 809

Timestamp:

12/20/10 07:17:34 (14 years ago)

Author:

walter

Message:

fixed problem with recursive instantiations reported by Stephan Dilly

Files:

• trunk/src/func.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (2 diffs)
• trunk/src/template.c (modified) (7 diffs)
• trunk/src/template.h (modified) (1 diff)

trunk/src/func.c

@@ -1587 +1587 @@
-                        fbody = new SynchronizedStatement(loc, vsync, fbody);
-                        fbody = fbody->semantic(sc2);
-                    }
-                }
-                else
-                {
-                    error("synchronized function %s must be a member of a class", toChars());
-                }
-            }
-#endif
-        }
-
-        sc2->callSuper = 0;
-        sc2->pop();
-    }
-
-    if (global.gag && global.errors != nerrors)
-        semanticRun = PASSsemanticdone; // Ensure errors get reported again
-    else
-        semanticRun = PASSsemantic3done;
+    //printf("-FuncDeclaration::semantic3('%s.%s', sc = %p, loc = %s)\n", parent->toChars(), toChars(), sc, loc.toChars());
+    //fflush(stdout);
-}
-
-void FuncDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    //printf("FuncDeclaration::toCBuffer() '%s'\n", toChars());
-
-    StorageClassDeclaration::stcToCBuffer(buf, storage_class);
-    type->toCBuffer(buf, ident, hgs);
-    bodyToCBuffer(buf, hgs);
-}
-
-int FuncDeclaration::equals(Object *o)
-{
-    if (this == o)
-        return TRUE;
-
-    Dsymbol *s = isDsymbol(o);
-    if (s)
-    {
-        FuncDeclaration *fd = s->isFuncDeclaration();

trunk/src/mtype.c

@@ -6050 +6050 @@
-                }
-                t = cd->type;
-                break;
-            }
-            sd = s->isStructDeclaration();
-            if (sd)
-            {
-                if (exp->op == TOKsuper)
-                {
-                    error(loc, "struct %s has no 'super'", sd->toChars());
-                    goto Lerr;
-                }
-                t = sd->type->pointerTo();
-                break;
-            }
-        }
-    }
-    else
-#endif
-    {
-
-
+
+
+
-#if DMDV2
-        if (exp->type && exp->type->ty == Tfunction &&
-            ((TypeFunction *)exp->type)->isproperty)
-
+2
-#endif
-->intypeof--
+2->pop()
-        if (exp->op == TOKtype)
-        {
-            error(loc, "argument %s to typeof is not an expression", exp->toChars());
-            goto Lerr;
-        }
-        t = exp->type;
-        if (!t)
-        {
-            error(loc, "expression (%s) has no type", exp->toChars());
-            goto Lerr;
-        }
-        if (t->ty == Ttypeof)
-        {   error(loc, "forward reference to %s", toChars());
-            goto Lerr;
-        }
-
-        /* typeof should reflect the true type,
-         * not what 'auto' would have gotten us.
-         */
-        //t = t->toHeadMutable();
@@ -7128 +7129 @@
-        }
-        return t->implicitConvTo(to);
-    }
-    return MATCHnomatch;
-}
-
-MATCH TypeStruct::implicitConvTo(Type *to)
-{   MATCH m;
-
-    //printf("TypeStruct::implicitConvTo(%s => %s)\n", toChars(), to->toChars());
-    if (to->ty == Taarray)
-    {
-        /* If there is an error instantiating AssociativeArray!(), it shouldn't
-         * be reported -- it just means implicit conversion is impossible.
-         */
-        ++global.gag;
-        int errs = global.errors;
-        to = ((TypeAArray*)to)->getImpl()->type;
-        --global.gag;
-        if (errs != global.errors)
-
+
+
-            return MATCHnomatch;
-        }
-    }
-
-    if (ty == to->ty && sym == ((TypeStruct *)to)->sym)
-    {   m = MATCHexact;         // exact match
-        if (mod != to->mod)
-        {
-            if (MODimplicitConv(mod, to->mod))
-                m = MATCHconst;
-            else
-            {   /* Check all the fields. If they can all be converted,
-                 * allow the conversion.
-                 */
-                for (int i = 0; i < sym->fields.dim; i++)
-                {   Dsymbol *s = (Dsymbol *)sym->fields.data[i];
-                    VarDeclaration *v = s->isVarDeclaration();
-                    assert(v && v->storage_class & STCfield);
-
-                    // 'from' type

trunk/src/template.c

@@ -703 +703 @@
-    if (!flag)
-    {
-        /* Any parameter left without a type gets the type of
-         * its corresponding arg
-         */
-        for (int i = 0; i < dedtypes_dim; i++)
-        {
-            if (!dedtypes->data[i])
-            {   assert(i < ti->tiargs->dim);
-                dedtypes->data[i] = ti->tiargs->data[i];
-            }
-        }
-    }
-
-#if DMDV2
-    if (m && constraint && !(flag & 1))
-    {   /* Check to see if constraint is satisfied.
-         */
-        makeParamNamesVisibleInConstraint(paramscope);
-        Expression *e = constraint->syntaxCopy();
-
-
+
+
+
+
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->isBool(TRUE))
-            ;
-        else if (e->isBool(FALSE))
-            goto Lnomatch;
-        else
-        {
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
-        }
-    }
-#endif
-
-#if LOGM
-    // Print out the results
-    printf("--------------------------\n");
-    printf("template %s\n", toChars());
-    printf("instance %s\n", ti->toChars());
-    if (m)
-    {
-        for (int i = 0; i < dedtypes_dim; i++)
@@ -1291 +1293 @@
-                        oded = (Object *)new Tuple();
-                    }
-                    else
-                        goto Lnomatch;
-                }
-            }
-            declareParameter(paramscope, tparam, oded);
-            dedargs->data[i] = (void *)oded;
-        }
-    }
-
-#if DMDV2
-    if (constraint)
-    {   /* Check to see if constraint is satisfied.
-         */
-        makeParamNamesVisibleInConstraint(paramscope);
-        Expression *e = constraint->syntaxCopy();
-        paramscope->flags |= SCOPEstaticif;
-
-        /* Detect recursive attempts to instantiate this template declaration,
+         * Bugzilla 4072
-         *  void foo(T)(T x) if (is(typeof(foo(x)))) { }
-bug4072
+foo
-         * Recursive attempts are regarded as a constraint failure.
-         */
+        int nmatches = 0;
-        for (Previous *p = previous; p; p = p->prev)
-        {
-            if (arrayObjectMatch(p->dedargs, dedargs, this, sc))
-
+
+
+
+
-            /* BUG: should also check for ref param differences
-             */
-        }
+        /* Look for 2 matches at least, because sometimes semantic3() gets run causing what appears to
+         * be recursion but isn't.
+         * Template A's constraint instantiates B, B's semantic3() run includes something that has A in its constraint.
+         * Perhaps a better solution is to always defer semantic3() rather than doing it eagerly. The risk
+         * with that is what if semantic3() fails, but our constraint "succeeded"?
+         */
+        if (nmatches >= 2)
+            goto Lnomatch;
+
-        Previous pr;
-        pr.prev = previous;
-        pr.dedargs = dedargs;
-        previous = &pr;                 // add this to threaded list
-
-        int nerrors = global.errors;
-
-        e = e->semantic(paramscope);
-
-        previous = pr.prev;             // unlink from threaded list
-
-        if (nerrors != global.errors)   // if any errors from evaluating the constraint, no match
-            goto Lnomatch;
-
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->isBool(TRUE))
-            ;
-        else if (e->isBool(FALSE))
-            goto Lnomatch;
-        else
@@ -3832 +3848 @@
-                    }
-                }
-            }
-        }
-
-        // It's a match
-        inst = ti;
-        parent = ti->parent;
-#if LOG
-        printf("\tit's a match with instance %p\n", inst);
-#endif
-        return;
-
-     L1:
-        ;
-    }
-
-    /* So, we need to implement 'this' instance.
-     */
-#if LOG
-
+
+
-#endif
-    unsigned errorsave = global.errors;
-    inst = this;
-    int tempdecl_instance_idx = tempdecl->instances.dim;
-    tempdecl->instances.push(this);
-    parent = tempdecl->parent;
-    //printf("parent = '%s'\n", parent->kind());
-
-
+tiargs
-
-#if 1
-    if (isnested)
-        parent = isnested;
-#endif
-    //printf("parent = '%s'\n", parent->kind());
-
-    // Add 'this' to the enclosing scope's members[] so the semantic routines
-    // will get called on the instance members
-#if 1
-    int dosemantic3 = 0;
-    {   Array *a;
-
-        Scope *scx = sc;
-#if 0
-        for (scx = sc; scx; scx = scx->enclosing)
-            if (scx->scopesym)
-                break;
-#endif
-
@@ -3884 +3901 @@
-            scx->scopesym->members && !scx->scopesym->isTemplateMixin()
-#if 0 // removed because it bloated compile times
-            /* The problem is if A imports B, and B imports A, and both A
-             * and B instantiate the same template, does the compilation of A
-             * or the compilation of B do the actual instantiation?
-             *
-             * see bugzilla 2500.
-             */
-            && !scx->module->selfImports()
-#endif
-           )
-        {
-            //printf("\t1: adding to %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
-            a = scx->scopesym->members;
-        }
-        else
-        {   Module *m = sc->module->importedFrom;
-            //printf("\t2: adding to module %s instead of module %s\n", m->toChars(), sc->module->toChars());
-            a = m->members;
-            if (m->semanticRun >= 3)
+            {
-                dosemantic3 = 1;
+            }
-        }
-        for (int i = 0; 1; i++)
-        {
-            if (i == a->dim)
-            {
-                a->push(this);
-                break;
-            }
-            if (this == (Dsymbol *)a->data[i])  // if already in Array
-                break;
-        }
-    }
-#endif
-
-    // Copy the syntax trees from the TemplateDeclaration
-    members = Dsymbol::arraySyntaxCopy(tempdecl->members);
-
-    // Create our own scope for the template parameters
-    Scope *scope = tempdecl->scope;
-    if (!tempdecl->semanticRun)
@@ -4086 +4105 @@
-            fatal();
-        }
-#endif
-    }
-
-  Laftersemantic:
-    sc2->pop();
-
-    scope->pop();
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-        error(loc, "error instantiating");
-        if (tinst)
-        {   tinst->printInstantiationTrace();
-        }
-        errors = 1;
-        if (global.gag)
-        {   // Try to reset things so we can try again later to instantiate it
+            //printf("remove %s\n", toChars());
-            tempdecl->instances.remove(tempdecl_instance_idx);
-            if (!(sc->flags & SCOPEstaticif))
-            {   // Bugzilla 4302 for discussion
-                semanticRun = 0;
-                inst = NULL;
-            }
-        }
-    }
-
-#if LOG
-    printf("-TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-}
-
-
-void TemplateInstance::semanticTiargs(Scope *sc)
-{
-    //printf("+TemplateInstance::semanticTiargs() %s\n", toChars());
-    if (semantictiargsdone)
-        return;
@@ -4590 +4610 @@
-                    nested |= 1;
-                }
-                else
-                    error("cannot use local '%s' as parameter to non-global template %s", sa->toChars(), tempdecl->toChars());
-            }
-        }
-        else if (va)
-        {
-            nested |= hasNestedArgs(&va->objects);
-        }
-    }
-    return nested;
-}
-
-/****************************************
- * This instance needs an identifier for name mangling purposes.
- * Create one by taking the template declaration name and adding
- * the type signature for it.
- */
-
-
+Objects *args
-{   OutBuffer buf;
-
-    //printf("TemplateInstance::genIdent('%s')\n", tempdecl->ident->toChars());
-    char *id = tempdecl->ident->toChars();
-    buf.printf("__T%zu%s", strlen(id), id);
-    Objects *args = tiargs;
-    for (int i = 0; i < args->dim; i++)
-    {   Object *o = (Object *)args->data[i];
-        Type *ta = isType(o);
-        Expression *ea = isExpression(o);
-        Dsymbol *sa = isDsymbol(o);
-        Tuple *va = isTuple(o);
-        //printf("\to [%d] %p ta %p ea %p sa %p va %p\n", i, o, ta, ea, sa, va);
-        if (ta)
-        {
-            buf.writeByte('T');
-            if (ta->deco)
-                buf.writestring(ta->deco);
-            else
-            {
-#ifdef DEBUG
-                printf("ta = %d, %s\n", ta->ty, ta->toChars());
-#endif
-                assert(global.errors);
-            }
-        }
@@ -5181 +5200 @@
-                scope = scx ? scx : new Scope(*sc);
-                scope->setNoFree();
-                scope->module->addDeferredSemantic(this);
-            }
-            return;
-        }
-    }
-
-    // Run semantic on each argument, place results in tiargs[]
-    semanticTiargs(sc);
-    if (errors)
-        return;
-
-    tempdecl = findBestMatch(sc);
-    if (!tempdecl)
-    {   inst = this;
-        return;         // error recovery
-    }
-
-    if (!ident)
-
+tiargs
-
-    inst = this;
-    parent = sc->parent;
-
-    /* Detect recursive mixin instantiations.
-     */
-    for (Dsymbol *s = parent; s; s = s->parent)
-    {
-        //printf("\ts = '%s'\n", s->toChars());
-        TemplateMixin *tm = s->isTemplateMixin();
-        if (!tm || tempdecl != tm->tempdecl)
-            continue;
-
-        /* Different argument list lengths happen with variadic args
-         */
-        if (tiargs->dim != tm->tiargs->dim)
-            continue;
-
-        for (int i = 0; i < tiargs->dim; i++)
-        {   Object *o = (Object *)tiargs->data[i];

trunk/src/template.h

@@ -309 +309 @@
-    void semantic3(Scope *sc);
-    void inlineScan();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Dsymbol *toAlias();                 // resolve real symbol
-    const char *kind();
-    int oneMember(Dsymbol **ps);
-    int needsTypeInference(Scope *sc);
-    char *toChars();
-    char *mangle();
-    void printInstantiationTrace();
-
-    void toObjFile(int multiobj);                       // compile to .obj file
-
-    // Internal
-    static void semanticTiargs(Loc loc, Scope *sc, Objects *tiargs, int flags);
-    void semanticTiargs(Scope *sc);
-    TemplateDeclaration *findTemplateDeclaration(Scope *sc);
-    TemplateDeclaration *findBestMatch(Scope *sc);
-    void declareParameters(Scope *sc);
-    int hasNestedArgs(Objects *tiargs);
-
+Objects *args
-
-    TemplateInstance *isTemplateInstance() { return this; }
-    AliasDeclaration *isAliasDeclaration();
-};
-
-struct TemplateMixin : TemplateInstance
-{
-    Array *idents;
-    Type *tqual;
-
-    TemplateMixin(Loc loc, Identifier *ident, Type *tqual, Array *idents, Objects *tiargs);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    void semantic3(Scope *sc);
-    void inlineScan();
-    const char *kind();
-    int oneMember(Dsymbol **ps);
-    int hasPointers();
-    char *toChars();