[llvm] 0eafc73 - Revert "[llvm] simplify and clean-up DemangleConfig.h" (#150160)

[via llvm-commits]

Author: Andrew Rogers
Date: 2025-07-22T23:08:18-05:00
New Revision: 0eafc737248f1232309cef6824a5a95d0747626e

URL: https://github.com/llvm/llvm-project/commit/0eafc737248f1232309cef6824a5a95d0747626e
DIFF: https://github.com/llvm/llvm-project/commit/0eafc737248f1232309cef6824a5a95d0747626e.diff

LOG: Revert "[llvm] simplify and clean-up DemangleConfig.h" (#150160)

Reverts llvm/llvm-project#149163 because it introduced a layering
violation.

Support depends on Demangle:

[llvm-project/llvm/lib/Support/Unix/Signals.inc](https://github.com/llvm/llvm-project/blob/324773e238026c5d4f501213678a89bf411e1509/llvm/lib/Support/Unix/Signals.inc#L38)

Line 38 in
[324773e](https://github.com/llvm/llvm-project/commit/324773e238026c5d4f501213678a89bf411e1509)

Added: 
    

Modified: 
    llvm/include/llvm/Demangle/DemangleConfig.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Demangle/DemangleConfig.h b/llvm/include/llvm/Demangle/DemangleConfig.h
index 0b4aba016612b..30f72ffe0d7ef 100644
--- a/llvm/include/llvm/Demangle/DemangleConfig.h
+++ b/llvm/include/llvm/Demangle/DemangleConfig.h
@@ -6,26 +6,86 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Contains DEMANGLE_ aliases for LLVM_ definitions. The canonical copy of
-// ItaniumDemangle.h cannot depend on LLVM headers because lives in the
-// libcxxabi project.
+// This file contains a variety of feature test macros copied from
+// include/llvm/Support/Compiler.h so that LLVMDemangle does not need to take
+// a dependency on LLVMSupport.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_DEMANGLE_DEMANGLECONFIG_H
 #define LLVM_DEMANGLE_DEMANGLECONFIG_H
 
-#include "llvm/Support/Compiler.h"
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#ifndef __has_cpp_attribute
+#define __has_cpp_attribute(x) 0
+#endif
+
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#ifndef DEMANGLE_GNUC_PREREQ
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch)                           \
+  ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) + __GNUC_PATCHLEVEL__ >=          \
+   ((maj) << 20) + ((min) << 10) + (patch))
+#elif defined(__GNUC__) && defined(__GNUC_MINOR__)
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch)                           \
+  ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) >= ((maj) << 20) + ((min) << 10))
+#else
+#define DEMANGLE_GNUC_PREREQ(maj, min, patch) 0
+#endif
+#endif
 
-#define DEMANGLE_DUMP_METHOD LLVM_DUMP_METHOD
-#define DEMANGLE_FALLTHROUGH LLVM_FALLTHROUGH
+#if __has_attribute(used) || DEMANGLE_GNUC_PREREQ(3, 1, 0)
+#define DEMANGLE_ATTRIBUTE_USED __attribute__((__used__))
+#else
+#define DEMANGLE_ATTRIBUTE_USED
+#endif
 
-#if defined(LLVM_BUILTIN_UNREACHABLE)
-#define DEMANGLE_UNREACHABLE LLVM_BUILTIN_UNREACHABLE
+#if __has_builtin(__builtin_unreachable) || DEMANGLE_GNUC_PREREQ(4, 5, 0)
+#define DEMANGLE_UNREACHABLE __builtin_unreachable()
+#elif defined(_MSC_VER)
+#define DEMANGLE_UNREACHABLE __assume(false)
 #else
 #define DEMANGLE_UNREACHABLE
 #endif
 
+#if __has_attribute(noinline) || DEMANGLE_GNUC_PREREQ(3, 4, 0)
+#define DEMANGLE_ATTRIBUTE_NOINLINE __attribute__((noinline))
+#elif defined(_MSC_VER)
+#define DEMANGLE_ATTRIBUTE_NOINLINE __declspec(noinline)
+#else
+#define DEMANGLE_ATTRIBUTE_NOINLINE
+#endif
+
+#if !defined(NDEBUG)
+#define DEMANGLE_DUMP_METHOD DEMANGLE_ATTRIBUTE_NOINLINE DEMANGLE_ATTRIBUTE_USED
+#else
+#define DEMANGLE_DUMP_METHOD DEMANGLE_ATTRIBUTE_NOINLINE
+#endif
+
+#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
+#define DEMANGLE_FALLTHROUGH [[fallthrough]]
+#elif __has_cpp_attribute(gnu::fallthrough)
+#define DEMANGLE_FALLTHROUGH [[gnu::fallthrough]]
+#elif !__cplusplus
+// Workaround for llvm.org/PR23435, since clang 3.6 and below emit a spurious
+// error when __has_cpp_attribute is given a scoped attribute in C mode.
+#define DEMANGLE_FALLTHROUGH
+#elif __has_cpp_attribute(clang::fallthrough)
+#define DEMANGLE_FALLTHROUGH [[clang::fallthrough]]
+#else
+#define DEMANGLE_FALLTHROUGH
+#endif
+
 #ifndef DEMANGLE_ASSERT
 #include <cassert>
 #define DEMANGLE_ASSERT(__expr, __msg) assert((__expr) && (__msg))