[clang] d85d57e - Revert "[OpenCL] Allow optional __generic in __remove_address_space utility"

[Justas Janickas via cfe-commits]

Author: Justas Janickas
Date: 2021-11-09T09:42:17Z
New Revision: d85d57e98789d187cac415d9d8a0973ae6f2e4e1

URL: https://github.com/llvm/llvm-project/commit/d85d57e98789d187cac415d9d8a0973ae6f2e4e1
DIFF: https://github.com/llvm/llvm-project/commit/d85d57e98789d187cac415d9d8a0973ae6f2e4e1.diff

LOG: Revert "[OpenCL] Allow optional __generic in __remove_address_space utility"

This reverts commit 81081daef0299ad59fca299c7cde3888fa691c6a.

Added: 
    

Modified: 
    clang/lib/Headers/opencl-c-base.h
    clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
index 7485386c82346..9c81ddb5e2a73 100644
--- a/clang/lib/Headers/opencl-c-base.h
+++ b/clang/lib/Headers/opencl-c-base.h
@@ -600,11 +600,9 @@ typedef struct {
 // C++ for OpenCL - __remove_address_space
 #if defined(__OPENCL_CPP_VERSION__)
 template <typename _Tp> struct __remove_address_space { using type = _Tp; };
-#if defined(__opencl_c_generic_address_space)
 template <typename _Tp> struct __remove_address_space<__generic _Tp> {
   using type = _Tp;
 };
-#endif
 template <typename _Tp> struct __remove_address_space<__global _Tp> {
   using type = _Tp;
 };

diff  --git a/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp b/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp
index 9043a7d53c682..f6f0c3290aa66 100644
--- a/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp
+++ b/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp
@@ -1,6 +1,4 @@
-// RUN: %clang_cc1 %s -cl-std=clc++1.0 -fdeclare-opencl-builtins -finclude-default-header
-// RUN: %clang_cc1 %s -cl-std=clc++2021 -fdeclare-opencl-builtins -finclude-default-header
-// RUN: %clang_cc1 %s -cl-std=clc++2021 -cl-ext=-__opencl_c_generic_address_space,-__opencl_c_pipes -fdeclare-opencl-builtins -finclude-default-header
+// RUN: %clang_cc1 %s -cl-std=clc++ -fdeclare-opencl-builtins -finclude-default-header
 
 template<typename T, typename U>
 struct is_same {
@@ -21,10 +19,8 @@ void test_is_same() {
 void test_remove_address_space() {
   static_assert(is_same<__remove_address_space<int>::type, int>::value,
                 "type without an address space unexpectedly modified by __remove_address_space");
-#if defined(__opencl_c_generic_address_space)
   static_assert(is_same<__remove_address_space<__generic int>::type, int>::value,
                 "__generic address space not removed by __remove_address_space");
-#endif
   static_assert(is_same<__remove_address_space<__global char>::type, char>::value,
                 "__global address space not removed by __remove_address_space");
   static_assert(is_same<__remove_address_space<__private ulong>::type, ulong>::value,