Merge commit '911cee2fd086' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 3aa6c5dd408c · 2024-11-11T14:34:57.000+05:30
diff --git a/clang/lib/Headers/openmp_wrappers/complex_cmath.h b/clang/lib/Headers/openmp_wrappers/complex_cmath.h
@@ -64,8 +64,13 @@ template <class _Tp> __DEVICE__ _Tp norm(const std::complex<_Tp> &__c) {
 }
 
 // conj
-
-template <class _Tp> std::complex<_Tp> conj(const std::complex<_Tp> &__c) {
+#ifdef _GLIBCXX20_CONSTEXPR
+#define CXX20_CONSTEXPR_DEVICE __DEVICE__
+#else
+#define CXX20_CONSTEXPR_DEVICE
+#endif
+template <class _Tp>
+CXX20_CONSTEXPR_DEVICE std::complex<_Tp> conj(const std::complex<_Tp> &__c) {
   return std::complex<_Tp>(__c.real(), -__c.imag());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,13 @@ template <class _Tp> __DEVICE__ _Tp norm(const std::complex<_Tp> &__c) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// conj`
`67`		`-`
`68`		`-template <class _Tp> std::complex<_Tp> conj(const std::complex<_Tp> &__c) {`
	`67`	`+#ifdef _GLIBCXX20_CONSTEXPR`
	`68`	`+#define CXX20_CONSTEXPR_DEVICE __DEVICE__`
	`69`	`+#else`
	`70`	`+#define CXX20_CONSTEXPR_DEVICE`
	`71`	`+#endif`
	`72`	`+template <class _Tp>`
	`73`	`+CXX20_CONSTEXPR_DEVICE std::complex<_Tp> conj(const std::complex<_Tp> &__c) {`
`69`	`74`	`return std::complex<_Tp>(__c.real(), -__c.imag());`
`70`	`75`	`}`
`71`	`76`