https://github.com/kraj created https://github.com/llvm/llvm-project/pull/174528
OffloadArch uses an enumerator named `UNUSED`, which is a very common macro name in external codebases (e.g. Mesa defines UNUSED as an attribute helper). If such a macro is visible when including clang/Basic/OffloadArch.h, the preprocessor expands the token inside the enum and breaks compilation of the installed Clang headers. Rename the enumerator to `UNUSED_` and update all in-tree references. This is a spelling-only change (no behavioral impact) and mirrors the existing approach used for SM_32_ to avoid macro clashes. >From 782245824c88eef023b03051e3de3b6d3ae2519e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 5 Jan 2026 18:30:54 -0800 Subject: [PATCH] [Clang] Rename OffloadArch::UNUSED to UNUSED_ to avoid macro collisions OffloadArch uses an enumerator named `UNUSED`, which is a very common macro name in external codebases (e.g. Mesa defines UNUSED as an attribute helper). If such a macro is visible when including clang/Basic/OffloadArch.h, the preprocessor expands the token inside the enum and breaks compilation of the installed Clang headers. Rename the enumerator to `UNUSED_` and update all in-tree references. This is a spelling-only change (no behavioral impact) and mirrors the existing approach used for SM_32_ to avoid macro clashes. --- clang/include/clang/Basic/OffloadArch.h | 2 +- clang/lib/Basic/OffloadArch.cpp | 2 +- clang/lib/Basic/Targets/NVPTX.cpp | 6 +++--- clang/lib/Basic/Targets/NVPTX.h | 2 +- clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 2 +- clang/lib/Driver/Driver.cpp | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/clang/include/clang/Basic/OffloadArch.h b/clang/include/clang/Basic/OffloadArch.h index ea665b1f49e08..b7d6e00f628e3 100644 --- a/clang/include/clang/Basic/OffloadArch.h +++ b/clang/include/clang/Basic/OffloadArch.h @@ -16,7 +16,7 @@ class StringRef; namespace clang { enum class OffloadArch { - UNUSED, + UNUSED_, UNKNOWN, // TODO: Deprecate and remove GPU architectures older than sm_52. SM_20, diff --git a/clang/lib/Basic/OffloadArch.cpp b/clang/lib/Basic/OffloadArch.cpp index 05177f1c58038..6a743c73473e2 100644 --- a/clang/lib/Basic/OffloadArch.cpp +++ b/clang/lib/Basic/OffloadArch.cpp @@ -17,7 +17,7 @@ struct OffloadArchToStringMap { #define GFX(gpu) {OffloadArch::GFX##gpu, "gfx" #gpu, "compute_amdgcn"} static const OffloadArchToStringMap ArchNames[] = { // clang-format off - {OffloadArch::UNUSED, "", ""}, + {OffloadArch::UNUSED_, "", ""}, SM(20), {OffloadArch::SM_21, "sm_21", "compute_20"}, // Fermi SM(30), {OffloadArch::SM_32_, "sm_32", "compute_32"}, SM(35), SM(37), // Kepler SM(50), SM(52), SM(53), // Maxwell diff --git a/clang/lib/Basic/Targets/NVPTX.cpp b/clang/lib/Basic/Targets/NVPTX.cpp index 06db3aae0c755..7bbb4b696f9b1 100644 --- a/clang/lib/Basic/Targets/NVPTX.cpp +++ b/clang/lib/Basic/Targets/NVPTX.cpp @@ -62,7 +62,7 @@ NVPTXTargetInfo::NVPTXTargetInfo(const llvm::Triple &Triple, // Define available target features // These must be defined in sorted order! NoAsmVariants = true; - GPU = OffloadArch::UNUSED; + GPU = OffloadArch::UNUSED_; // PTX supports f16 as a fundamental type. HasFastHalfType = true; @@ -174,7 +174,7 @@ void NVPTXTargetInfo::getTargetDefines(const LangOptions &Opts, Builder.defineMacro("__NVPTX__"); // Skip setting architecture dependent macros if undefined. - if (GPU == OffloadArch::UNUSED && !HostTarget) + if (GPU == OffloadArch::UNUSED_ && !HostTarget) return; if (Opts.CUDAIsDevice || Opts.OpenMPIsTargetDevice || !HostTarget) { @@ -243,7 +243,7 @@ void NVPTXTargetInfo::getTargetDefines(const LangOptions &Opts, case OffloadArch::UNKNOWN: assert(false && "No GPU arch when compiling CUDA device code."); return ""; - case OffloadArch::UNUSED: + case OffloadArch::UNUSED_: case OffloadArch::SM_20: return "200"; case OffloadArch::SM_21: diff --git a/clang/lib/Basic/Targets/NVPTX.h b/clang/lib/Basic/Targets/NVPTX.h index 6338a4f2f9036..3bd199a342115 100644 --- a/clang/lib/Basic/Targets/NVPTX.h +++ b/clang/lib/Basic/Targets/NVPTX.h @@ -87,7 +87,7 @@ class LLVM_LIBRARY_VISIBILITY NVPTXTargetInfo : public TargetInfo { initFeatureMap(llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU, const std::vector<std::string> &FeaturesVec) const override { - if (GPU != OffloadArch::UNUSED) + if (GPU != OffloadArch::UNUSED_) Features[OffloadArchToString(GPU)] = true; Features["ptx" + std::to_string(PTXVersion)] = true; return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec); diff --git a/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp b/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp index db0d56d6b18cc..6df0b3b3574d6 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp @@ -2382,7 +2382,7 @@ void CGOpenMPRuntimeGPU::processRequiresDirective(const OMPRequiresDecl *D) { case OffloadArch::Generic: case OffloadArch::GRANITERAPIDS: case OffloadArch::BMG_G21: - case OffloadArch::UNUSED: + case OffloadArch::UNUSED_: case OffloadArch::UNKNOWN: break; case OffloadArch::LAST: diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index b2828ebc5a4f6..086a59a0404f6 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -961,12 +961,12 @@ inferOffloadToolchains(Compilation &C, Action::OffloadKind Kind) { return llvm::DenseSet<llvm::StringRef>(); } if (Kind == Action::OFK_OpenMP && - (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED)) { + (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED_)) { C.getDriver().Diag(clang::diag::err_drv_failed_to_deduce_target_from_arch) << Arch; return llvm::DenseSet<llvm::StringRef>(); } - if (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED) { + if (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED_) { C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch) << "offload" << Arch; return llvm::DenseSet<llvm::StringRef>(); @@ -3407,7 +3407,7 @@ class OffloadingActionBuilder final { // If we have a fat binary, add it to the list. if (CudaFatBinary) { - AddTopLevel(CudaFatBinary, OffloadArch::UNUSED); + AddTopLevel(CudaFatBinary, OffloadArch::UNUSED_); CudaDeviceActions.clear(); CudaFatBinary = nullptr; return; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
