Cannot work without is_constant_evaluated

NVIDIA · Oct 4, 2024 · cfdce0b · cfdce0b
1 parent 87ed0d1
commit cfdce0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/libcudacxx/include/cuda/std/__memory/assume_aligned.h b/libcudacxx/include/cuda/std/__memory/assume_aligned.h
@@ -39,9 +39,9 @@ _CCCL_NODISCARD _LIBCUDACXX_HIDE_FROM_ABI _CCCL_CONSTEXPR_CXX14 _Tp* assume_alig
 #if (!defined(_CCCL_COMPILER_GCC) || _CCCL_GCC_VERSION >= 90000) && !defined(_CCCL_COMPILER_MSVC)
     _CCCL_ASSERT(reinterpret_cast<uintptr_t>(__ptr) % _Align == 0, "Alignment assumption is violated");
 #endif // gcc >= 9
-#if defined(_CCCL_BUILTIN_ASSUME_ALIGNED)
+#if defined(_CCCL_BUILTIN_ASSUME_ALIGNED) && defined(_CCCL_BUILTIN_IS_CONSTANT_EVALUATED)
     return static_cast<_Tp*>(__builtin_assume_aligned(__ptr, _Align));
-#endif // _CCCL_BUILTIN_ASSUME_ALIGNED
+#endif // _CCCL_BUILTIN_ASSUME_ALIGNED && _CCCL_BUILTIN_IS_CONSTANT_EVALUATED
   }
   return __ptr;
 }

diff --git a/libcudacxx/test/libcudacxx/std/utilities/memory/ptr.align/assume_aligned.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/memory/ptr.align/assume_aligned.pass.cpp
@@ -84,13 +84,13 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 bool tests()
   check(&l);
   check(&d);
 
-  S s;
-  S4 s4;
-  S8 s8;
-  S16 s16;
-  S32 s32;
-  S64 s64;
-  S128 s128;
+  S s{};
+  S4 s4{};
+  S8 s8{};
+  S16 s16{};
+  S32 s32{};
+  S64 s64{};
+  S128 s128{};
   check(&s);
   check(&s4);
   check(&s8);