Skip to content

Draft: Revert "[OpenCL] Allow taking address of functions as an extension." #2

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

Closed
wants to merge 1 commit into from
Closed

Draft: Revert "[OpenCL] Allow taking address of functions as an extension." #2

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
3 changes: 1 addition & 2 deletions clang/lib/Parse/ParseExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,8 +1809,7 @@ ExprResult Parser::ParseCastExpression(CastParseKind ParseKind,
// These can be followed by postfix-expr pieces.
PreferredType = SavedType;
Res = ParsePostfixExpressionSuffix(Res);
if (getLangOpts().OpenCL && !getActions().getOpenCLOptions().isEnabled(
"__cl_clang_function_pointers"))
if (getLangOpts().OpenCL)
if (Expr *PostfixExpr = Res.get()) {
QualType Ty = PostfixExpr->getType();
if (!Ty.isNull() && Ty->isFunctionType()) {
Expand Down
26 changes: 2 additions & 24 deletions clang/test/SemaOpenCL/func.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ typedef struct s

//Function pointer
void foo(void*);
#ifdef FUNCPTREXT
//expected-note@-2{{passing argument to parameter here}}
#endif

// Expect no diagnostics for an empty parameter list.
void bar();
Expand All @@ -54,30 +51,11 @@ void bar()
#endif

// taking the address of a function is an error
foo((void*)foo);
#ifndef FUNCPTREXT
// expected-error@-2{{taking address of function is not allowed}}
#else
// FIXME: Functions should probably be in the address space defined by the
// implementation. It might make sense to put them into the Default address
// space that is bind to a physical segment by the target rather than fixing
// it to any of the concrete OpenCL address spaces during parsing.
// expected-error@-8{{casting 'void (*)(__private void *__private)' to type '__private void *' changes address space}}
#endif
foo((void*)foo); // expected-error{{taking address of function is not allowed}}
foo(&foo); // expected-error{{taking address of function is not allowed}}

foo(&foo);
#ifndef FUNCPTREXT
// expected-error@-2{{taking address of function is not allowed}}
#else
// expected-error@-4{{passing 'void (*)(__private void *__private)' to parameter of type '__private void *' changes address space of pointer}}
#endif

// FIXME: If we stop rejecting the line below a bug (PR49315) gets
// hit due to incorrectly handled pointer conversion.
#ifndef FUNCPTREXT
// initializing an array with the address of functions is an error
void* vptrarr[2] = {foo, &foo}; // expected-error{{taking address of function is not allowed}} expected-error{{taking address of function is not allowed}}
#endif

// just calling a function is correct
foo(0);
Expand Down