Merge pull request #5774 from 9rnsr/fix16022

[REG2.069] Issue 16022 - dmd assertion failure due to misplaced comma operator
dlang · May 14, 2016 · 35190b0 · 35190b0
2 parents 0c882ef + dd3e980
commit 35190b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/denum.d b/src/denum.d
@@ -561,6 +561,7 @@ public:
             sc = _scope;
 
         protection = ed.isAnonymous() ? ed.protection : Prot(PROTpublic);
+        linkage = LINKd;
         storage_class = STCmanifest;
         userAttribDecl = ed.isAnonymous() ? ed.userAttribDecl : null;
 

diff --git a/src/tocsym.c b/src/tocsym.c
@@ -239,7 +239,8 @@ Symbol *toSymbol(Dsymbol *s)
                     m = mTYman_d;
                     break;
                 default:
-                    printf("linkage = %d\n", vd->linkage);
+                    printf("linkage = %d, vd = %s %s @ [%s]\n",
+                        vd->linkage, vd->kind(), vd->toChars(), vd->loc.toChars());
                     assert(0);
             }
 

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -7799,6 +7799,16 @@ struct Grapheme15961
     }
 }
 
+/***************************************************/
+// 16022
+
+bool test16022()
+{
+    enum Type { Colon, Comma }
+    Type type;
+    return type == Type.Colon, type == Type.Comma;
+}
+
 /***************************************************/
 
 int main()