From a7777b9454e8a08bbd83d714ae8d8d6a765a2484 Mon Sep 17 00:00:00 2001
From: Mikhail Lychkov <mikhail.lychkov@intel.com>
Date: Fri, 19 Mar 2021 10:49:33 +0300
Subject: [PATCH] Revert "[OpenCL] Allow taking address of functions as an
 extension."

This reverts commit abbdb5639c70d167bd66cd62296927330782c3b4.
---
 clang/lib/Parse/ParseExpr.cpp |  3 +--
 clang/test/SemaOpenCL/func.cl | 26 ++------------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index a82ae8375359f..85edff3fe5181 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -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()) {
diff --git a/clang/test/SemaOpenCL/func.cl b/clang/test/SemaOpenCL/func.cl
index bcac30b67e372..8a9c20289f592 100644
--- a/clang/test/SemaOpenCL/func.cl
+++ b/clang/test/SemaOpenCL/func.cl
@@ -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();
@@ -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);