From 87ec1f460d0efbc565e89f817af73c2496361749 Mon Sep 17 00:00:00 2001 From: Artem Belevich Date: Tue, 12 Sep 2023 13:35:07 -0700 Subject: [PATCH] Work around two more instances of __noinline__ conflicts. (#66138) Fixes https://github.com/llvm/llvm-project/issues/57544 (cherry picked from commit 588023ddafb4b0cd11914ab068c6d07187374d69) --- clang/lib/Headers/CMakeLists.txt | 2 ++ clang/lib/Headers/cuda_wrappers/bits/basic_string.h | 9 +++++++++ clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100644 clang/lib/Headers/cuda_wrappers/bits/basic_string.h create mode 100644 clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index f2b0c5cddcbb..db47de2ad965 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -275,6 +275,8 @@ set(cuda_wrapper_files set(cuda_wrapper_bits_files cuda_wrappers/bits/shared_ptr_base.h + cuda_wrappers/bits/basic_string.h + cuda_wrappers/bits/basic_string.tcc ) set(ppc_wrapper_files diff --git a/clang/lib/Headers/cuda_wrappers/bits/basic_string.h b/clang/lib/Headers/cuda_wrappers/bits/basic_string.h new file mode 100644 index 000000000000..64f50d9f6a72 --- /dev/null +++ b/clang/lib/Headers/cuda_wrappers/bits/basic_string.h @@ -0,0 +1,9 @@ +// CUDA headers define __noinline__ which interferes with libstdc++'s use of +// `__attribute((__noinline__))`. In order to avoid compilation error, +// temporarily unset __noinline__ when we include affected libstdc++ header. + +#pragma push_macro("__noinline__") +#undef __noinline__ +#include_next "bits/basic_string.h" + +#pragma pop_macro("__noinline__") diff --git a/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc b/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc new file mode 100644 index 000000000000..90c7fe34d932 --- /dev/null +++ b/clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc @@ -0,0 +1,9 @@ +// CUDA headers define __noinline__ which interferes with libstdc++'s use of +// `__attribute((__noinline__))`. In order to avoid compilation error, +// temporarily unset __noinline__ when we include affected libstdc++ header. + +#pragma push_macro("__noinline__") +#undef __noinline__ +#include_next "bits/basic_string.tcc" + +#pragma pop_macro("__noinline__") -- 2.34.1