Author: Justas Janickas Date: 2021-11-09T08:13:34Z New Revision: 81081daef0299ad59fca299c7cde3888fa691c6a
URL: https://github.com/llvm/llvm-project/commit/81081daef0299ad59fca299c7cde3888fa691c6a DIFF: https://github.com/llvm/llvm-project/commit/81081daef0299ad59fca299c7cde3888fa691c6a.diff LOG: [OpenCL] Allow optional __generic in __remove_address_space utility Clang builtin utility `__remove_address_space` now works if generic address space is not supported in C++ for OpenCL 2021. Differential Revision: https://reviews.llvm.org/D110155 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 9c81ddb5e2a73..7485386c82346 100644 --- a/clang/lib/Headers/opencl-c-base.h +++ b/clang/lib/Headers/opencl-c-base.h @@ -600,9 +600,11 @@ 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 f6f0c3290aa66..9043a7d53c682 100644 --- a/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp +++ b/clang/test/CodeGenOpenCLCXX/remove-address-space.clcpp @@ -1,4 +1,6 @@ -// RUN: %clang_cc1 %s -cl-std=clc++ -fdeclare-opencl-builtins -finclude-default-header +// 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 template<typename T, typename U> struct is_same { @@ -19,8 +21,10 @@ 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, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits