Skip to content

fix Issue 18963 - Relax restrictions on 'return' parameters when para… #8346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Jun 14, 2018
Merged

fix Issue 18963 - Relax restrictions on 'return' parameters when para… #8346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/dmd/typesem.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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
}
}
}
Expand Down
14 changes: 13 additions & 1 deletion test/fail_compilation/test16228.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand All @@ -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);
}