fix Issue 17582 - Applying const to struct declaration should make th…

…e struct type const
dlang · Jul 3, 2017 · 07452c2 · 07452c2
1 parent d7887fb
commit 07452c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/ddmd/dstruct.d b/src/ddmd/dstruct.d
@@ -297,6 +297,8 @@ extern (C++) class StructDeclaration : AggregateDeclaration
 
         if (this.errors)
             type = Type.terror;
+        if (semanticRun == PASSinit)
+            type = type.addSTC(sc.stc | storage_class);
         type = type.semantic(loc, sc);
         if (type.ty == Tstruct && (cast(TypeStruct)type).sym != this)
         {

diff --git a/test/runnable/testconst.d b/test/runnable/testconst.d
@@ -2806,9 +2806,15 @@ void test6982()
 /************************************/
 // 7038
 
-static assert(!is(S7038 == const));
+static assert(is(S7038 == const));
 const struct S7038{ int x; }
-static assert(!is(S7038 == const));
+static assert(is(S7038 == const));
+
+shared struct S7038b{ int x; }
+static assert(is(S7038b == shared));
+
+immutable struct S7038c{ int x; }
+static assert(is(S7038c == immutable));
 
 static assert(!is(C7038 == const));
 const class C7038{ int x; }
@@ -2817,7 +2823,7 @@ static assert(!is(C7038 == const));
 void test7038()
 {
     S7038 s;
-    static assert(!is(typeof(s) == const));
+    static assert(is(typeof(s) == const));
     static assert(is(typeof(s.x) == const int));
 
     C7038 c;