Merge pull request #8346 from WalterBright/fix18963

fix Issue 18963 - Relax restrictions on 'return' parameters when para… merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>
dlang · Jun 14, 2018 · 7bf48f8 · 7bf48f8
2 parents 56a69ae + d8793c0
commit 7bf48f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/dmd/typesem.d b/src/dmd/typesem.d
@@ -875,7 +875,7 @@ private extern (C++) final class TypeSemanticVisitor : Visitor
 
             if (tf.isreturn && !tf.isref && !tf.next.hasPointers())
             {
-                mtype.error(loc, "function type `%s` has `return` but does not return any indirections", tf.toChars());
+                tf.isreturn = false;
             }
         }
 
@@ -964,9 +964,7 @@ private extern (C++) final class TypeSemanticVisitor : Visitor
                         }
                         else if (tf.next && !tf.next.hasPointers())
                         {
-                            mtype.error(loc, "parameter `%s` is `return` but function does not return any indirections",
-                                fparam.ident ? fparam.ident.toChars() : "");
-                            errors = true;
+                            fparam.storageClass &= ~STC.return_;   // https://issues.dlang.org/show_bug.cgi?id=18963
                         }
                     }
                 }

diff --git a/test/fail_compilation/test16228.d b/test/fail_compilation/test16228.d
@@ -1,13 +1,13 @@
 /* REQUIRED_ARGS: -dip25
    TEST_OUTPUT:
 ---
-fail_compilation/test16228.d(22): Error: function type `int() return` has `return` but does not return any indirections
 fail_compilation/test16228.d(23): Error: function `test16228.S.bar` `static` member has no `this` to which `return` can apply
 ---
 */
 
 
 
+
 // https://issues.dlang.org/show_bug.cgi?id=16228
 
 int* wrap ( return ref int input )
@@ -22,3 +22,15 @@ struct S
     int foo() return { return 3; }
     static ref int bar() return { return x; }
 }
+
+
+// https://issues.dlang.org/show_bug.cgi?id=18963
+
+T Identity(T)(return T t) { return t; }
+
+void bar(int i, void* p)
+{
+    Identity(p);
+    Identity(i);
+}
+