Merge pull request #3900 from 9rnsr/fix11312

Issue 11312 - Avoid auto-dereference for UFCS functions
dlang · Aug 26, 2014 · 8b6765c · 8b6765c
1 parent 71af9f5
commit 8b6765c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -7407,12 +7407,21 @@ Expression *DotIdExp::semanticY(Scope *sc, int flag)
              ident != Id::init && ident != Id::__sizeof &&
              ident != Id::__xalignof && ident != Id::offsetof &&
              ident != Id::mangleof && ident != Id::stringof)
-    {   /* Rewrite:
+    {
+        Type *t1bn = t1b->nextOf();
+        if (flag)
+        {
+            AggregateDeclaration *ad = isAggregate(t1bn);
+            if (ad && !ad->members)   // Bugzilla 11312
+                return NULL;
+        }
+
+        /* Rewrite:
          *   p.ident
          * as:
          *   (*p).ident
          */
-        if (flag && t1b->nextOf()->ty == Tvoid)
+        if (flag && t1bn->ty == Tvoid)
             return NULL;
         e = new PtrExp(loc, e1);
         e = e->semantic(sc);

diff --git a/test/runnable/ufcs.d b/test/runnable/ufcs.d
@@ -794,6 +794,21 @@ void test10609()
     static assert(__traits(compiles, x.foo10609 ));
 }
 
+/*******************************************/
+// 11312
+
+struct S11312;
+
+S11312* getS11312() { return null; }
+int getValue(S11312*) { return 10; }
+
+void test11312()
+{
+    S11312* op = getS11312();
+    int x = op.getValue();
+    assert(x == 10);
+}
+
 /*******************************************/
 
 int main()
@@ -823,6 +838,7 @@ int main()
     test10041();
     test10047();
     test10526();
+    test11312();
 
     printf("Success\n");
     return 0;