Merge pull request #3528 from 9rnsr/fix12703

[REG2.065] Issue 12703 - final class rejects members initialization
dlang · May 5, 2014 · cf56c8c · cf56c8c
2 parents fd09d6b + c6a4932
commit cf56c8c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/class.c b/src/class.c
@@ -619,6 +619,8 @@ void ClassDeclaration::semantic(Scope *sc)
     sc2->protection = PROTpublic;
     sc2->explicitProtection = 0;
     sc2->structalign = STRUCTALIGN_DEFAULT;
+    sc2->userAttribDecl = NULL;
+
     if (baseClass)
     {
         alignsize = baseClass->alignsize;
@@ -632,7 +634,6 @@ void ClassDeclaration::semantic(Scope *sc)
         else
             structsize = Target::ptrsize * 2;   // allow room for __vptr and __monitor
     }
-    sc2->userAttribDecl = NULL;
     size_t members_dim = members->dim;
     sizeok = SIZEOKnone;
 
@@ -1452,14 +1453,16 @@ void InterfaceDeclaration::semantic(Scope *sc)
     Scope *sc2 = sc->push(this);
     sc2->stc &= STCsafe | STCtrusted | STCsystem;
     sc2->parent = this;
+    sc2->inunion = 0;
     if (com)
         sc2->linkage = LINKwindows;
     else if (cpp)
         sc2->linkage = LINKcpp;
-    sc2->structalign = STRUCTALIGN_DEFAULT;
     sc2->protection = PROTpublic;
     sc2->explicitProtection = 0;
+    sc2->structalign = STRUCTALIGN_DEFAULT;
     sc2->userAttribDecl = NULL;
+
     structsize = Target::ptrsize * 2;
     inuse++;
 

diff --git a/src/struct.c b/src/struct.c
@@ -202,13 +202,22 @@ void AggregateDeclaration::semantic2(Scope *sc)
     }
 
     Scope *sc2 = sc->push(this);
+    sc2->stc &= STCsafe | STCtrusted | STCsystem;
     sc2->parent = this;
+    //if (isUnionDeclaration())     // TODO
+    //    sc2->inunion = 1;
+    sc2->protection = PROTpublic;
+    sc2->explicitProtection = 0;
+    sc2->structalign = STRUCTALIGN_DEFAULT;
+    sc2->userAttribDecl = NULL;
+
     for (size_t i = 0; i < members->dim; i++)
     {
         Dsymbol *s = (*members)[i];
         //printf("\t[%d] %s\n", i, s->toChars());
         s->semantic2(sc2);
     }
+
     sc2->pop();
 }
 
@@ -227,12 +236,21 @@ void AggregateDeclaration::semantic3(Scope *sc)
     }
 
     Scope *sc2 = sc->push(this);
+    sc2->stc &= STCsafe | STCtrusted | STCsystem;
     sc2->parent = this;
+    if (isUnionDeclaration())
+        sc2->inunion = 1;
+    sc2->protection = PROTpublic;
+    sc2->explicitProtection = 0;
+    sc2->structalign = STRUCTALIGN_DEFAULT;
+    sc2->userAttribDecl = NULL;
+
     for (size_t i = 0; i < members->dim; i++)
     {
         Dsymbol *s = (*members)[i];
         s->semantic3(sc2);
     }
+
     sc2->pop();
 
     // don't do it for unused deprecated types

diff --git a/test/compilable/compile1.d b/test/compilable/compile1.d
@@ -612,3 +612,16 @@ void test12688()
     s.foo.writeln12688;   // ok
     (s.foo).writeln12688; // ok <- ng
 }
+
+/***************************************************/
+// 12703
+
+struct S12703
+{
+    this(int) {}
+}
+
+final class C12703
+{
+    S12703 s = S12703(1);
+}