Changeset 781

Timestamp:

12/05/10 20:54:55 (14 years ago)

Author:

walter

Message:

bugzilla 5110 Excess attribute propagation of structs and classes

Files:

• branches/dmd-1.x/src/class.c (modified) (1 diff)
• branches/dmd-1.x/src/declaration.c (modified) (2 diffs)
• branches/dmd-1.x/src/declaration.h (modified) (1 diff)
• branches/dmd-1.x/src/func.c (modified) (2 diffs)
• trunk/src/class.c (modified) (1 diff)
• trunk/src/declaration.c (modified) (2 diffs)
• trunk/src/declaration.h (modified) (1 diff)
• trunk/src/func.c (modified) (3 diffs)
• trunk/src/struct.c (modified) (1 diff)

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

@@ -544 +544 @@
-                        }
-                    }
-                    else
-                        assert(0);
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-    if (storage_class & STCauto)
-        error("storage class 'auto' is invalid when declaring a class, did you mean to use 'scope'?");
-    if (storage_class & STCscope)
-        isscope = 1;
-    if (storage_class & STCabstract)
-        isabstract = 1;
-
-    sc = sc->push(this);
-
-
+
-    sc->parent = this;
-    sc->inunion = 0;
-
-    if (isCOMclass())
-    {
-#if _WIN32
-        sc->linkage = LINKwindows;
-#else
-        /* This enables us to use COM objects under Linux and
-         * work with things like XPCOM
-         */
-        sc->linkage = LINKc;
-#endif
-    }
-    sc->protection = PROTpublic;
-    sc->explicitProtection = 0;
-    sc->structalign = 8;
-    structalign = sc->structalign;
-    if (baseClass)
-    {   sc->offset = baseClass->structsize;

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

@@ -728 +728 @@
-    else
-        sv->hinit = hinit->syntaxCopy();
-#endif
-    return sv;
-}
-
-void VarDeclaration::semantic(Scope *sc)
-{
-#if 0
-    printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
-    printf(" type = %s\n", type ? type->toChars() : "null");
-    printf(" stc = x%x\n", sc->stc);
-    printf(" storage_class = x%x\n", storage_class);
-    printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
-#endif
-
-    storage_class |= sc->stc;
-    if (storage_class & STCextern && init)
-        error("extern symbols cannot have initializers");
+
+    AggregateDeclaration *ad = isThis();
+    if (ad)
+        storage_class |= ad->storage_class & STC_TYPECTOR;
-
-    /* If auto type inference, do the inference
-     */
-    int inferred = 0;
-    if (!type)
-    {   inuse++;
-        type = init->inferType(sc);
-        inuse--;
-        inferred = 1;
-
-        /* This is a kludge to support the existing syntax for RAII
-         * declarations.
-         */
-        storage_class &= ~STCauto;
-        originalType = type;
-    }
-    else
-    {   if (!originalType)
-            originalType = type;
-        type = type->semantic(loc, sc);
@@ -1277 +1281 @@
-     * too.
-     */
-    if (type)
-        type->toCBuffer(buf, ident, hgs);
-    else
-        buf->writestring(ident->toChars());
-    if (init)
-    {   buf->writestring(" = ");
-#if DMDV2
-        ExpInitializer *ie = init->isExpInitializer();
-        if (ie && (ie->exp->op == TOKconstruct || ie->exp->op == TOKblit))
-            ((AssignExp *)ie->exp)->e2->toCBuffer(buf, hgs);
-        else
-#endif
-            init->toCBuffer(buf, hgs);
-    }
-    buf->writeByte(';');
-    buf->writenl();
-}
-
+AggregateDeclaration *VarDeclaration::isThis()
+{
+    AggregateDeclaration *ad = NULL;
+
+    if (!(storage_class & (STCstatic | STCextern | STCmanifest | STCtemplateparameter |
+                           STCtls | STCgshared | STCctfe)))
+    {
+        if ((storage_class & (STCconst | STCimmutable)) && init)
+            return NULL;
+
+        for (Dsymbol *s = this; s; s = s->parent)
+        {
+            ad = s->isMember();
+            if (ad)
+                break;
+            if (!s->parent || !s->parent->isTemplateMixin()) break;
+        }
+    }
+    return ad;
+}
+
-int VarDeclaration::needThis()
-{
-    //printf("VarDeclaration::needThis(%s, x%x)\n", toChars(), storage_class);
-    return storage_class & STCfield;
-}
-
-int VarDeclaration::isImportedSymbol()
-{
-    if (protection == PROTexport && !init && (isStatic() || isConst() || parent->isModule()))
-        return TRUE;
-    return FALSE;
-}
-
-void VarDeclaration::checkCtorConstInit()
-{
-    if (ctorinit == 0 && isCtorinit() && !(storage_class & STCfield))
-        error("missing initializer in static constructor for const variable");
-}
-
-/************************************

branches/dmd-1.x/src/declaration.h

@@ -258 +258 @@
-    int canassign;              // it can be assigned to
-    Dsymbol *aliassym;          // if redone as alias to another symbol
-    Expression *value;          // when interpreting, this is the value
-                                // (NULL if value not determinable)
-#if DMDV2
-    VarDeclaration *rundtor;    // if !NULL, rundtor is tested at runtime to see
-                                // if the destructor should be run. Used to prevent
-                                // dtor calls on postblitted vars
-#endif
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    const char *kind();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Initializer *hinit;
-#endif
+    AggregateDeclaration *isThis();
-    int needThis();
-    int isImportedSymbol();
-    int isDataseg();
-    int isThreadlocal();
-    int isCTFE();
-    int hasPointers();
-#if DMDV2
-    int canTakeAddressOf();
-    int needsAutoDtor();
-#endif
-    Expression *callScopeDtor(Scope *sc);
-    ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
-    Dsymbol *toAlias();
-
-    Symbol *toSymbol();
-    void toObjFile(int multiobj);                       // compile to .obj file
-    int cvMember(unsigned char *p);

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

@@ -92 +92 @@
-    FuncDeclaration *f;
-
-    //printf("FuncDeclaration::syntaxCopy('%s')\n", toChars());
-    if (s)
-        f = (FuncDeclaration *)s;
-    else
-        f = new FuncDeclaration(loc, endloc, ident, storage_class, type->syntaxCopy());
-    f->outId = outId;
-    f->frequire = frequire ? frequire->syntaxCopy() : NULL;
-    f->fensure  = fensure  ? fensure->syntaxCopy()  : NULL;
-    f->fbody    = fbody    ? fbody->syntaxCopy()    : NULL;
-    assert(!fthrows); // deprecated
-    return f;
-}
-
-
-// Do the semantic analysis on the external interface to the function.
-
-void FuncDeclaration::semantic(Scope *sc)
-{   TypeFunction *f;
+    AggregateDeclaration *ad;
-    StructDeclaration *sd;
-    ClassDeclaration *cd;
-    InterfaceDeclaration *id;
-    Dsymbol *pd;
-
-#if 0
-    printf("FuncDeclaration::semantic(sc = %p, this = %p, '%s', linkage = %d)\n", sc, this, toPrettyChars(), sc->linkage);
-    if (isFuncLiteralDeclaration())
-        printf("\tFuncLiteralDeclaration()\n");
-    printf("sc->parent = %s, parent = %s\n", sc->parent->toChars(), parent ? parent->toChars() : "");
-    printf("type: %p, %s\n", type, type->toChars());
-#endif
-
-    if (semanticRun != PASSinit && isFuncLiteralDeclaration())
-    {
-        /* Member functions that have return types that are
-         * forward references can have semantic() run more than
-         * once on them.
-         * See test\interface2.d, test20
-         */
@@ -151 +153 @@
-    foverrides.setDim(0);       // reset in case semantic() is being retried for this function
-
-    if (!originalType)
-        originalType = type;
-    if (!type->deco)
-    {
-        type = type->semantic(loc, sc);
-    }
-    //type->print();
-    if (type->ty != Tfunction)
-    {
-        error("%s must be a function", toChars());
-        return;
-    }
-    f = (TypeFunction *)(type);
-    size_t nparams = Parameter::dim(f->parameters);
-
-    linkage = sc->linkage;
-    protection = sc->protection;
-    storage_class |= sc->stc;
+    ad = isThis();
+    if (ad)
+        storage_class |= ad->storage_class & (STC_TYPECTOR | STCsynchronized);
-    //printf("function storage_class = x%x\n", storage_class);
-
-    if (ident == Id::ctor && !isCtorDeclaration())
-        error("_ctor is reserved for constructors");
-
-    if (isConst() || isAuto() || isScope())
-        error("functions cannot be const or auto");
-
-    if (isAbstract() && !isVirtual())
-        error("non-virtual functions cannot be abstract");
-
-    if (isAbstract() && isFinal())
-        error("cannot be both final and abstract");
-#if 0
-    if (isAbstract() && fbody)
-        error("abstract functions cannot have bodies");
-#endif
-
-#if 0
-    if (isStaticConstructor() || isStaticDestructor())
-    {
-        if (!isStatic() || type->nextOf()->ty != Tvoid)
-            error("static constructors / destructors must be static void");
-        if (f->arguments && f->arguments->dim)
-            error("static constructors / destructors must have empty parameter list");
-        // BUG: check for invalid storage classes
-    }
-#endif
-
-#ifdef IN_GCC
-AggregateDeclaration *ad;
-
-ad = parent->isAggregateDeclaration();
-if (ad)
-    ad->methods.push(this);
+{
+
+    if (ad)
+        ad->methods.push(this);
+}
-#endif
-    sd = parent->isStructDeclaration();
-    if (sd)
-    {
-        // Verify no constructors, destructors, etc.
-        if (isCtorDeclaration() ||
-            isDtorDeclaration()
-            //|| isInvariantDeclaration()
-            //|| isUnitTestDeclaration()
-           )
-        {
-            error("special member functions not allowed for %ss", sd->kind());
-        }
-
-#if 0
-        if (!sd->inv)
-            sd->inv = isInvariantDeclaration();
-
-        if (!sd->aggNew)
-            sd->aggNew = isNewDeclaration();

trunk/src/class.c

@@ -561 +561 @@
-                }
-            }
-        }
-    }
-
-    if (storage_class & STCauto)
-        error("storage class 'auto' is invalid when declaring a class, did you mean to use 'scope'?");
-    if (storage_class & STCscope)
-        isscope = 1;
-    if (storage_class & STCabstract)
-        isabstract = 1;
-
-    if (storage_class & STCimmutable)
-        type = type->addMod(MODimmutable);
-    if (storage_class & STCconst)
-        type = type->addMod(MODconst);
-    if (storage_class & STCshared)
-        type = type->addMod(MODshared);
-
-    sc = sc->push(this);
-sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-             STCabstract | STCdeprecated | STC_TYPECTOR | STCtls | STCgshared)
-|= storage_class & STC_TYPECTOR
+//sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic | STCabstract | STCdeprecated | STC_TYPECTOR | STCtls | STCgshared);
+//sc->stc |= storage_class & STC_TYPECTOR
+&= STCsafe | STCtrusted | STCsystem
-    sc->parent = this;
-    sc->inunion = 0;
-
-    if (isCOMclass())
-    {
-#if _WIN32
-        sc->linkage = LINKwindows;
-#else
-        /* This enables us to use COM objects under Linux and
-         * work with things like XPCOM
-         */
-        sc->linkage = LINKc;
-#endif
-    }
-    sc->protection = PROTpublic;
-    sc->explicitProtection = 0;
-    sc->structalign = 8;
-    structalign = sc->structalign;
-    if (baseClass)
-    {   sc->offset = baseClass->structsize;

trunk/src/declaration.c

@@ -718 +718 @@
-    printf(" stc = x%x\n", sc->stc);
-    printf(" storage_class = x%x\n", storage_class);
-    printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
-#endif
-
-//    if (sem > SemanticStart)
-//      return;
-//    sem = SemanticIn;
-
-    if (scope)
-    {   sc = scope;
-        scope = NULL;
-    }
-
-    /* Pick up storage classes from context, but skip synchronized
-     */
-    storage_class |= (sc->stc & ~STCsynchronized);
-    if (storage_class & STCextern && init)
-        error("extern symbols cannot have initializers");
+
+    AggregateDeclaration *ad = isThis();
+    if (ad)
+        storage_class |= ad->storage_class & STC_TYPECTOR;
-
-    /* If auto type inference, do the inference
-     */
-    int inferred = 0;
-    if (!type)
-    {   inuse++;
-
-        ArrayInitializer *ai = init->isArrayInitializer();
-        if (ai)
-        {   Expression *e;
-            if (ai->isAssociativeArray())
-                e = ai->toAssocArrayLiteral();
-            else
-                e = init->toExpression();
-            if (!e)
-            {
-                error("cannot infer type from initializer");
-                e = new ErrorExp();
-            }
-            init = new ExpInitializer(e->loc, e);
@@ -1378 +1382 @@
-     * too.
-     */
-    if (type)
-        type->toCBuffer(buf, ident, hgs);
-    else
-        buf->writestring(ident->toChars());
-    if (init)
-    {   buf->writestring(" = ");
-#if DMDV2
-        ExpInitializer *ie = init->isExpInitializer();
-        if (ie && (ie->exp->op == TOKconstruct || ie->exp->op == TOKblit))
-            ((AssignExp *)ie->exp)->e2->toCBuffer(buf, hgs);
-        else
-#endif
-            init->toCBuffer(buf, hgs);
-    }
-    buf->writeByte(';');
-    buf->writenl();
-}
-
+AggregateDeclaration *VarDeclaration::isThis()
+{
+    AggregateDeclaration *ad = NULL;
+
+    if (!(storage_class & (STCstatic | STCextern | STCmanifest | STCtemplateparameter |
+                           STCtls | STCgshared | STCctfe)))
+    {
+        if ((storage_class & (STCconst | STCimmutable | STCwild)) && init)
+            return NULL;
+
+        for (Dsymbol *s = this; s; s = s->parent)
+        {
+            ad = s->isMember();
+            if (ad)
+                break;
+            if (!s->parent || !s->parent->isTemplateMixin()) break;
+        }
+    }
+    return ad;
+}
+
-int VarDeclaration::needThis()
-{
-    //printf("VarDeclaration::needThis(%s, x%x)\n", toChars(), storage_class);
-    return storage_class & STCfield;
-}
-
-int VarDeclaration::isImportedSymbol()
-{
-    if (protection == PROTexport && !init &&
-        (storage_class & STCstatic || parent->isModule()))
-        return TRUE;
-    return FALSE;
-}
-
-void VarDeclaration::checkCtorConstInit()
-{
-#if 0 /* doesn't work if more than one static ctor */
-    if (ctorinit == 0 && isCtorinit() && !(storage_class & STCfield))
-        error("missing initializer in static constructor for const variable");
-#endif

trunk/src/declaration.h

@@ -253 +253 @@
-    int canassign;              // it can be assigned to
-    Dsymbol *aliassym;          // if redone as alias to another symbol
-    Expression *value;          // when interpreting, this is the value
-                                // (NULL if value not determinable)
-#if DMDV2
-    VarDeclaration *rundtor;    // if !NULL, rundtor is tested at runtime to see
-                                // if the destructor should be run. Used to prevent
-                                // dtor calls on postblitted vars
-#endif
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    const char *kind();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-#ifdef _DH
-    Type *htype;
-    Initializer *hinit;
-#endif
+    AggregateDeclaration *isThis();
-    int needThis();
-    int isImportedSymbol();
-    int isDataseg();
-    int isThreadlocal();
-    int isCTFE();
-    int hasPointers();
-#if DMDV2
-    int canTakeAddressOf();
-    int needsAutoDtor();
-#endif
-    Expression *callScopeDtor(Scope *sc);
-    ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
-    Dsymbol *toAlias();
-
-    Symbol *toSymbol();
-    void toObjFile(int multiobj);                       // compile to .obj file
-    int cvMember(unsigned char *p);

trunk/src/func.c

@@ -92 +92 @@
-    FuncDeclaration *f;
-
-    //printf("FuncDeclaration::syntaxCopy('%s')\n", toChars());
-    if (s)
-        f = (FuncDeclaration *)s;
-    else
-        f = new FuncDeclaration(loc, endloc, ident, storage_class, type->syntaxCopy());
-    f->outId = outId;
-    f->frequire = frequire ? frequire->syntaxCopy() : NULL;
-    f->fensure  = fensure  ? fensure->syntaxCopy()  : NULL;
-    f->fbody    = fbody    ? fbody->syntaxCopy()    : NULL;
-    assert(!fthrows); // deprecated
-    return f;
-}
-
-
-// Do the semantic analysis on the external interface to the function.
-
-void FuncDeclaration::semantic(Scope *sc)
-{   TypeFunction *f;
+    AggregateDeclaration *ad;
-    StructDeclaration *sd;
-    ClassDeclaration *cd;
-    InterfaceDeclaration *id;
-    Dsymbol *pd;
-
-#if 0
-    printf("FuncDeclaration::semantic(sc = %p, this = %p, '%s', linkage = %d)\n", sc, this, toPrettyChars(), sc->linkage);
-    if (isFuncLiteralDeclaration())
-        printf("\tFuncLiteralDeclaration()\n");
-    printf("sc->parent = %s, parent = %s\n", sc->parent->toChars(), parent ? parent->toChars() : "");
-    printf("type: %p, %s\n", type, type->toChars());
-#endif
-
-    if (semanticRun != PASSinit && isFuncLiteralDeclaration())
-    {
-        /* Member functions that have return types that are
-         * forward references can have semantic() run more than
-         * once on them.
-         * See test\interface2.d, test20
-         */
@@ -137 +138 @@
-
-    if (semanticRun >= PASSsemanticdone)
-    {
-        if (!parent->isClassDeclaration())
-        {
-            return;
-        }
-        // need to re-run semantic() in order to set the class's vtbl[]
-    }
-    else
-    {
-        assert(semanticRun <= PASSsemantic);
-        semanticRun = PASSsemantic;
-    }
-
-    unsigned dprogress_save = Module::dprogress;
-
-    foverrides.setDim(0);       // reset in case semantic() is being retried for this function
-
-    storage_class |= sc->stc & ~STCref;
+    ad = isThis();
+    if (ad)
+        storage_class |= ad->storage_class & (STC_TYPECTOR | STCsynchronized);
+
-    //printf("function storage_class = x%llx, sc->stc = x%llx, %x\n", storage_class, sc->stc, Declaration::isFinal());
-
-    if (!originalType)
-        originalType = type;
-    if (!type->deco)
-    {
-        sc = sc->push();
-        sc->stc |= storage_class & (STCref | STCnothrow | STCpure | STCdisable
-            | STCsafe | STCtrusted | STCsystem);      // forward to function type
-
-        if (isCtorDeclaration())
-            sc->flags |= SCOPEctor;
-        type = type->semantic(loc, sc);
-        sc = sc->pop();
-
-        /* Apply const, immutable and shared storage class
-         * to the function type
-         */
-        StorageClass stc = storage_class;
-        if (type->isImmutable())
@@ -254 +259 @@
-
-    if (isAbstract() && isFinal())
-        error("cannot be both final and abstract");
-#if 0
-    if (isAbstract() && fbody)
-        error("abstract functions cannot have bodies");
-#endif
-
-#if 0
-    if (isStaticConstructor() || isStaticDestructor())
-    {
-        if (!isStatic() || type->nextOf()->ty != Tvoid)
-            error("static constructors / destructors must be static void");
-        if (f->arguments && f->arguments->dim)
-            error("static constructors / destructors must have empty parameter list");
-        // BUG: check for invalid storage classes
-    }
-#endif
-
-#ifdef IN_GCC
-AggregateDeclaration *ad;
-
-ad = parent->isAggregateDeclaration();
-if (ad)
-    ad->methods.push(this);
+{
+
+    if (ad)
+        ad->methods.push(this);
+}
-#endif
-    sd = parent->isStructDeclaration();
-    if (sd)
-    {
-        if (isCtorDeclaration())
-        {
-            goto Ldone;
-        }
-#if 0
-        // Verify no constructors, destructors, etc.
-        if (isCtorDeclaration()
-            //||isDtorDeclaration()
-            //|| isInvariantDeclaration()
-            //|| isUnitTestDeclaration()
-           )
-        {
-            error("special member functions not allowed for %ss", sd->kind());
-        }
-
-        if (!sd->inv)

trunk/src/struct.c

@@ -355 +355 @@
-                        if (ad)
-                            t = ad->handle;
-                        else
-                            t = Type::tvoidptr;
-                    }
-                    else
-                        assert(0);
-                    if (t->ty == Tstruct)
-                        t = Type::tvoidptr;     // t should not be a ref type
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-                    //vthis->storage_class |= STCref;
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-    sizeok = 0;
-    sc2 = sc->push(this);
-storage_class & STC_TYPECTOR
+STCsafe | STCtrusted | STCsystem
-    sc2->parent = this;
-    if (isUnionDeclaration())
-        sc2->inunion = 1;
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-
-    int members_dim = members->dim;
-
-    /* Set scope so if there are forward references, we still might be able to
-     * resolve individual members like enums.
-     */
-    for (int i = 0; i < members_dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-        /* There are problems doing this in the general case because
-         * Scope keeps track of things like 'offset'
-         */
-        if (s->isEnumDeclaration() || (s->isAggregateDeclaration() && s->ident))
-        {
-            //printf("setScope %s %s\n", s->kind(), s->toChars());
-            s->setScope(sc2);