Issue 6360 - @Property is doubled in di files when used with auto

Reduce redundant storage classes between FuncDeclaration::storage_class and FuncDeclaration::type
dlang · Sep 22, 2011 · a1566e3 · a1566e3
1 parent 0f1af1b
commit a1566e3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 15 deletions.
diff --git a/src/declaration.h b/src/declaration.h
@@ -74,6 +74,7 @@ enum PURE;
                                         // but not typed as "shared"
 #define STCwild         0x80000000LL    // for "wild" type constructor
 #define STC_TYPECTOR    (STCconst | STCimmutable | STCshared | STCwild)
+#define STC_FUNCATTR    (STCref | STCnothrow | STCpure | STCproperty | STCsafe | STCtrusted | STCsystem)
 
 #define STCproperty     0x100000000LL
 #define STCsafe         0x200000000LL

diff --git a/src/func.c b/src/func.c
@@ -38,6 +38,8 @@ FuncDeclaration::FuncDeclaration(Loc loc, Loc endloc, Identifier *id, StorageCla
     //printf("storage_class = x%x\n", storage_class);
     this->storage_class = storage_class;
     this->type = type;
+    if (type)
+        this->storage_class &= ~(STC_TYPECTOR | STC_FUNCATTR);
     this->loc = loc;
     this->endloc = endloc;
     fthrows = NULL;
@@ -3059,10 +3061,10 @@ void CtorDeclaration::semantic(Scope *sc)
     //printf("CtorDeclaration::semantic() %s\n", toChars());
     TypeFunction *tf = (TypeFunction *)type;
     assert(tf && tf->ty == Tfunction);
-    Expressions *fargs = ((TypeFunction *)type)->fargs;         // for auto ref
 
     sc = sc->push();
     sc->stc &= ~STCstatic;              // not a static constructor
+    sc->flags |= SCOPEctor;
 
     parent = sc->parent;
     Dsymbol *parent = toParent2();
@@ -3077,17 +3079,16 @@ void CtorDeclaration::semantic(Scope *sc)
     {   tret = ad->handle;
         assert(tret);
         tret = tret->addStorageClass(storage_class | sc->stc);
+        tret = tret->addMod(type->mod);
     }
-    tf = new TypeFunction(tf->parameters, tret, tf->varargs, LINKd, storage_class | sc->stc);
-    tf->fargs = fargs;
-    type = tf;
+    tf->next = tret;
+    type = type->semantic(loc, sc);
 
 #if STRUCTTHISREF
     if (ad && ad->isStructDeclaration())
-    {   ((TypeFunction *)type)->isref = 1;
-        if (!originalType)
-            // Leave off the "ref"
-            originalType = new TypeFunction(tf->parameters, tret, tf->varargs, LINKd, storage_class | sc->stc);
+    {   if (!originalType)
+            originalType = type->syntaxCopy();
+        ((TypeFunction *)type)->isref = 1;
     }
 #endif
     if (!originalType)
@@ -3155,13 +3156,8 @@ int CtorDeclaration::addPostInvariant()
 
 void CtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
-    TypeFunction *tf = (TypeFunction *)type;
-    assert(tf && tf->ty == Tfunction);
-
-    if (originalType && originalType->ty == Tfunction)
-        ((TypeFunction *)originalType)->attributesToCBuffer(buf, 0);
-    buf->writestring("this");
-    Parameter::argsToCBuffer(buf, hgs, tf->parameters, tf->varargs);
+    StorageClassDeclaration::stcToCBuffer(buf, storage_class);
+    type->toCBuffer(buf, Id::This, hgs);    // ident == Id::this
     bodyToCBuffer(buf, hgs);
 }
 

diff --git a/src/mtype.c b/src/mtype.c
@@ -4454,6 +4454,9 @@ TypeFunction::TypeFunction(Parameters *parameters, Type *treturn, int varargs, e
     if (stc & STCproperty)
         this->isproperty = true;
 
+    if (stc & STCref)
+        this->isref = true;
+
     this->trust = TRUSTdefault;
     if (stc & STCsafe)
         this->trust = TRUSTsafe;

diff --git a/test/compilable/extra-files/header.di b/test/compilable/extra-files/header.di
@@ -384,3 +384,16 @@ return 0;
 );
 }
 }
+struct S6360
+{
+    @property const pure nothrow long weeks1()
+{
+return 0;
+}
+
+    const nothrow pure @property long weeks2()
+{
+return 0;
+}
+
+}
diff --git a/test/compilable/header.d b/test/compilable/header.d
@@ -314,3 +314,11 @@ int bar11(T)()
 }
 
 
+struct S6360
+{
+    @property long weeks1() const pure nothrow { return 0; }
+
+    @property const pure nothrow long weeks2() { return 0; }
+}
+
+