Merge pull request #5181 from jacob-carlborg/15180_segfault_uda

Fix #15180: [REG2.069.0-b1] Segfault with empty struct used as UDA
dlang · Oct 10, 2015 · 03db3e3 · 03db3e3
2 parents f09bb06 + 6efbee2
commit 03db3e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/objc.d b/src/objc.d
@@ -154,22 +154,24 @@ extern (C++) void objc_InterfaceDeclaration_semantic_objcExtern(InterfaceDeclara
 // MARK: semantic
 extern (C++) void objc_FuncDeclaration_semantic_setSelector(FuncDeclaration fd, Scope* sc)
 {
+    import ddmd.tokens;
+
     if (!fd.userAttribDecl)
         return;
     Expressions* udas = fd.userAttribDecl.getAttributes();
     arrayExpressionSemantic(udas, sc, true);
     for (size_t i = 0; i < udas.dim; i++)
     {
         Expression uda = (*udas)[i];
-        assert(uda.type);
-        if (uda.type.ty != Ttuple)
+        assert(uda);
+        if (uda.op != TOKtuple)
             continue;
         Expressions* exps = (cast(TupleExp)uda).exps;
         for (size_t j = 0; j < exps.dim; j++)
         {
             Expression e = (*exps)[j];
-            assert(e.type);
-            if (e.type.ty != Tstruct)
+            assert(e);
+            if (e.op != TOKstructliteral)
                 continue;
             StructLiteralExp literal = cast(StructLiteralExp)e;
             assert(literal.sd);

diff --git a/test/compilable/uda.d b/test/compilable/uda.d
@@ -0,0 +1,7 @@
+/************************************************/
+// 15180: [REG2.069.0-b1] Segfault with empty struct used as UDA
+
+struct foo { }
+@foo bar () { }
+
+/************************************************/