Remove old code

Author: alexey-milovidov

base/base/Decimal.h

@@ -1,14 +1,9 @@
 #pragma once
+
 #include <base/extended_types.h>
 #include <base/Decimal_fwd.h>
+#include <base/defines.h>
 
-#if !defined(NO_SANITIZE_UNDEFINED)
-#if defined(__clang__)
-    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
-#else
-    #define NO_SANITIZE_UNDEFINED
-#endif
-#endif
 
 namespace DB
 {

base/base/JSON.cpp

@@ -10,14 +10,10 @@
 #define JSON_MAX_DEPTH 100
 
 
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
 POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException") // NOLINT(cert-err60-cpp, modernize-use-noexcept, hicpp-use-noexcept)
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 
 /// Read unsigned integer in a simple form from a non-0-terminated string.

base/base/JSON.h

@@ -39,14 +39,10 @@
 
 
 // NOLINTBEGIN(google-explicit-constructor)
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
 POCO_DECLARE_EXCEPTION(Foundation_API, JSONException, Poco::Exception)
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 // NOLINTEND(google-explicit-constructor)
 
 class JSON

base/base/coverage.cpp

@@ -13,11 +13,7 @@
 #include <unistd.h>
 
 
-#    if defined(__clang__)
 extern "C" void __llvm_profile_dump(); // NOLINT
-#    elif defined(__GNUC__) || defined(__GNUG__)
-extern "C" void __gcov_exit();
-#    endif
 
 #endif
 
@@ -28,12 +24,7 @@ void dumpCoverageReportIfPossible()
     static std::mutex mutex;
     std::lock_guard lock(mutex);
 
-#    if defined(__clang__)
     __llvm_profile_dump(); // NOLINT
-#    elif defined(__GNUC__) || defined(__GNUG__)
-    __gcov_exit();
-#    endif
-
 #endif
 }
 

base/base/defines.h

@@ -11,7 +11,7 @@
 ///   including <base/defines.h>
 /// - it should not have fallback to 0,
 ///   since this may create false-positive detection (common problem)
-#if defined(__clang__) && defined(__has_feature)
+#if defined(__has_feature)
 #    define ch_has_feature __has_feature
 #endif
 
@@ -76,24 +76,11 @@
 /// Explicitly allow undefined behaviour for certain functions. Use it as a function attribute.
 /// It is useful in case when compiler cannot see (and exploit) it, but UBSan can.
 /// Example: multiplication of signed integers with possibility of overflow when both sides are from user input.
-#if defined(__clang__)
-#    define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
-#    define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
-#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
-#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED __attribute__((__always_inline__, __no_sanitize__("undefined")))
-#else  /// It does not work in GCC. GCC 7 cannot recognize this attribute and GCC 8 simply ignores it.
-#    define NO_SANITIZE_UNDEFINED
-#    define NO_SANITIZE_ADDRESS
-#    define NO_SANITIZE_THREAD
-#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED ALWAYS_INLINE
-#endif
-
-#if defined(__clang__) && defined(__clang_major__) && __clang_major__ >= 14
-#    define DISABLE_SANITIZER_INSTRUMENTATION __attribute__((disable_sanitizer_instrumentation))
-#else
-#    define DISABLE_SANITIZER_INSTRUMENTATION
-#endif
-
+#define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
+#define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
+#define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED __attribute__((__always_inline__, __no_sanitize__("undefined")))
+#define DISABLE_SANITIZER_INSTRUMENTATION __attribute__((disable_sanitizer_instrumentation))
 
 #if !__has_include(<sanitizer/asan_interface.h>) || !defined(ADDRESS_SANITIZER)
 #   define ASAN_UNPOISON_MEMORY_REGION(a, b)
@@ -135,54 +122,33 @@
 
 /// Macros for Clang Thread Safety Analysis (TSA). They can be safely ignored by other compilers.
 /// Feel free to extend, but please stay close to https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#mutexheader
-#if defined(__clang__)
-#    define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       /// data is protected by given capability
-#    define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 /// pointed-to data is protected by the given capability
-#    define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                /// thread needs exclusive possession of given capability
-#    define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  /// thread needs shared possession of given capability
-#    define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               /// annotated lock must be locked after given lock
-#    define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           /// disable TSA for a function
-#    define TSA_CAPABILITY(...) __attribute__((capability(__VA_ARGS__)))                       /// object of a class can be used as capability
-#    define TSA_ACQUIRE(...) __attribute__((acquire_capability(__VA_ARGS__)))                        /// function acquires a capability, but does not release it
-#    define TSA_TRY_ACQUIRE(...) __attribute__((try_acquire_capability(__VA_ARGS__)))                /// function tries to acquire a capability and returns a boolean value indicating success or failure
-#    define TSA_RELEASE(...) __attribute__((release_capability(__VA_ARGS__)))                        /// function releases the given capability
-#    define TSA_ACQUIRE_SHARED(...) __attribute__((acquire_shared_capability(__VA_ARGS__)))          /// function acquires a shared capability, but does not release it
-#    define TSA_TRY_ACQUIRE_SHARED(...) __attribute__((try_acquire_shared_capability(__VA_ARGS__)))  /// function tries to acquire a shared capability and returns a boolean value indicating success or failure
-#    define TSA_RELEASE_SHARED(...) __attribute__((release_shared_capability(__VA_ARGS__)))          /// function releases the given shared capability
-#    define TSA_SCOPED_LOCKABLE __attribute__((scoped_lockable)) /// object of a class has scoped lockable capability
+#define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       /// data is protected by given capability
+#define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 /// pointed-to data is protected by the given capability
+#define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                /// thread needs exclusive possession of given capability
+#define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  /// thread needs shared possession of given capability
+#define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               /// annotated lock must be locked after given lock
+#define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           /// disable TSA for a function
+#define TSA_CAPABILITY(...) __attribute__((capability(__VA_ARGS__)))                       /// object of a class can be used as capability
+#define TSA_ACQUIRE(...) __attribute__((acquire_capability(__VA_ARGS__)))                        /// function acquires a capability, but does not release it
+#define TSA_TRY_ACQUIRE(...) __attribute__((try_acquire_capability(__VA_ARGS__)))                /// function tries to acquire a capability and returns a boolean value indicating success or failure
+#define TSA_RELEASE(...) __attribute__((release_capability(__VA_ARGS__)))                        /// function releases the given capability
+#define TSA_ACQUIRE_SHARED(...) __attribute__((acquire_shared_capability(__VA_ARGS__)))          /// function acquires a shared capability, but does not release it
+#define TSA_TRY_ACQUIRE_SHARED(...) __attribute__((try_acquire_shared_capability(__VA_ARGS__)))  /// function tries to acquire a shared capability and returns a boolean value indicating success or failure
+#define TSA_RELEASE_SHARED(...) __attribute__((release_shared_capability(__VA_ARGS__)))          /// function releases the given shared capability
+#define TSA_SCOPED_LOCKABLE __attribute__((scoped_lockable)) /// object of a class has scoped lockable capability
 
 /// Macros for suppressing TSA warnings for specific reads/writes (instead of suppressing it for the whole function)
 /// They use a lambda function to apply function attribute to a single statement. This enable us to suppress warnings locally instead of
 /// suppressing them in the whole function
 /// Consider adding a comment when using these macros.
-#   define TSA_SUPPRESS_WARNING_FOR_READ(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> const auto & { return (x); }())
-#   define TSA_SUPPRESS_WARNING_FOR_WRITE(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> auto & { return (x); }())
+#define TSA_SUPPRESS_WARNING_FOR_READ(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> const auto & { return (x); }())
+#define TSA_SUPPRESS_WARNING_FOR_WRITE(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> auto & { return (x); }())
 
 /// This macro is useful when only one thread writes to a member
 /// and you want to read this member from the same thread without locking a mutex.
 /// It's safe (because no concurrent writes are possible), but TSA generates a warning.
 /// (Seems like there's no way to verify it, but it makes sense to distinguish it from TSA_SUPPRESS_WARNING_FOR_READ for readability)
-#   define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
-
-#else
-#    define TSA_GUARDED_BY(...)
-#    define TSA_PT_GUARDED_BY(...)
-#    define TSA_REQUIRES(...)
-#    define TSA_REQUIRES_SHARED(...)
-#    define TSA_NO_THREAD_SAFETY_ANALYSIS
-#    define TSA_CAPABILITY(...)
-#    define TSA_ACQUIRE(...)
-#    define TSA_TRY_ACQUIRE(...)
-#    define TSA_RELEASE(...)
-#    define TSA_ACQUIRE_SHARED(...)
-#    define TSA_TRY_ACQUIRE_SHARED(...)
-#    define TSA_RELEASE_SHARED(...)
-#    define TSA_SCOPED_LOCKABLE
-
-#    define TSA_SUPPRESS_WARNING_FOR_READ(x) (x)
-#    define TSA_SUPPRESS_WARNING_FOR_WRITE(x) (x)
-#    define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
-#endif
+#define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
 
 /// A template function for suppressing warnings about unused variables or function results.
 template <typename... Args>

base/base/iostream_debug_helpers.h

@@ -155,9 +155,7 @@ Out & dump(Out & out, const char * name, T && x) // NOLINT(cppcoreguidelines-mis
     return dumpValue(out, x) << "; ";
 }
 
-#ifdef __clang__
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#endif
 
 #define DUMPVAR(VAR) ::dump(std::cerr, #VAR, (VAR));
 #define DUMPHEAD std::cerr << __FILE__ << ':' << __LINE__ << " [ " << getThreadId() << " ] ";

base/base/phdr_cache.cpp

@@ -11,10 +11,8 @@
 /// Thread Sanitizer uses dl_iterate_phdr function on initialization and fails if we provide our own.
 #ifdef USE_PHDR_CACHE
 
-#if defined(__clang__)
-#   pragma clang diagnostic ignored "-Wreserved-id-macro"
-#   pragma clang diagnostic ignored "-Wunused-macros"
-#endif
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#pragma clang diagnostic ignored "-Wunused-macros"
 
 #define __msan_unpoison(X, Y) // NOLINT
 #if defined(ch_has_feature)
@@ -57,10 +55,6 @@ std::atomic<PHDRCache *> phdr_cache {};
 
 
 extern "C"
-#ifndef __clang__
-[[gnu::visibility("default")]]
-[[gnu::externally_visible]]
-#endif
 int dl_iterate_phdr(int (*callback) (dl_phdr_info * info, size_t size, void * data), void * data)
 {
     auto * current_phdr_cache = phdr_cache.load();

base/glibc-compatibility/musl/getauxval.c

@@ -20,11 +20,7 @@
 
 /// Suppress TSan since it is possible for this code to be called from multiple threads,
 /// and initialization is safe to be done multiple times from multiple threads.
-#if defined(__clang__)
-#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
-#else
-#    define NO_SANITIZE_THREAD
-#endif
+#define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
 
 // We don't have libc struct available here.
 // Compute aux vector manually (from /proc/self/auxv).

base/harmful/harmful.c

@@ -6,11 +6,7 @@
 /// It is only enabled in debug build (its intended use is for CI checks).
 #if !defined(NDEBUG)
 
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wincompatible-library-redeclaration"
-#else
-    #pragma GCC diagnostic ignored "-Wbuiltin-declaration-mismatch"
-#endif
+#pragma clang diagnostic ignored "-Wincompatible-library-redeclaration"
 
 /// We cannot use libc headers here.
 long write(int, const void *, unsigned long);

programs/benchmark/Benchmark.cpp

@@ -567,10 +567,6 @@ class Benchmark : public Poco::Util::Application
 }
 
 
-#ifndef __clang__
-#pragma GCC optimize("-fno-var-tracking-assignments")
-#endif
-
 int mainEntryClickHouseBenchmark(int argc, char ** argv)
 {
     using namespace DB;