Merge pull request #3802 from ibuclaw/bug145

[2.066b] Issue 13194 - ICE when initializing static class members to void
dlang · Jul 23, 2014 · b4335c9 · b4335c9
2 parents f740f0d + 68f4f8c
commit b4335c9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -1753,10 +1753,10 @@ void VarDeclaration::semantic2(Scope *sc)
     }
     else if (init && isThreadlocal())
     {
-        if ((type->ty == Tclass)&&type->isMutable()&&!type->isShared())
+        if ((type->ty == Tclass) && type->isMutable() && !type->isShared())
         {
             ExpInitializer *ei = init->isExpInitializer();
-            if (ei->exp->op == TOKclassreference)
+            if (ei && ei->exp->op == TOKclassreference)
                 error("is mutable. Only const or immutable class thread local variable are allowed, not %s", type->toChars());
         }
         else if (type->ty == Tpointer && type->nextOf()->ty == Tstruct && type->nextOf()->isMutable() &&!type->nextOf()->isShared())

diff --git a/test/compilable/test13194.d b/test/compilable/test13194.d
@@ -0,0 +1,17 @@
+module test13194;
+
+class C13194
+{
+    static Object o = void;
+}
+
+struct S13194
+{
+    static Object o = void;
+}
+
+union U13194
+{
+    static Object o = void;
+}
+