Remove device override for operator new when the C++ standard >= 26 (#114056)

OgnianM · web-flow · commit 9204eba91215 · 2024-11-15T13:53:24.000-08:00
Related to #114048
diff --git a/clang/lib/Headers/cuda_wrappers/new b/clang/lib/Headers/cuda_wrappers/new
@@ -91,12 +91,14 @@ __device__ inline void operator delete[](void *ptr,
 #endif
 
 // Device overrides for placement new and delete.
+#if !(_LIBCPP_STD_VER >= 26 || __cpp_lib_constexpr_new >= 202406L)
 __device__ inline void *operator new(__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT {
   return __ptr;
 }
 __device__ inline void *operator new[](__SIZE_TYPE__, void *__ptr) CUDA_NOEXCEPT {
   return __ptr;
 }
+#endif
 __device__ inline void operator delete(void *, void *) CUDA_NOEXCEPT {}
 __device__ inline void operator delete[](void *, void *) CUDA_NOEXCEPT {}
 

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,14 @@ __device__ inline void operator delete[](void *ptr,`
`91`	`91`	`#endif`
`92`	`92`
`93`	`93`	`// Device overrides for placement new and delete.`
	`94`	`+#if !(_LIBCPP_STD_VER >= 26 \|\| __cpp_lib_constexpr_new >= 202406L)`
`94`	`95`	`__device__ inline void operator new(__SIZE_TYPE__, void __ptr) CUDA_NOEXCEPT {`
`95`	`96`	`return __ptr;`
`96`	`97`	`}`
`97`	`98`	`__device__ inline void operator new[](__SIZE_TYPE__, void __ptr) CUDA_NOEXCEPT {`
`98`	`99`	`return __ptr;`
`99`	`100`	`}`
	`101`	`+#endif`
`100`	`102`	`__device__ inline void operator delete(void , void ) CUDA_NOEXCEPT {}`
`101`	`103`	`__device__ inline void operator delete[](void , void ) CUDA_NOEXCEPT {}`
`102`	`104`