--- ./base/check.h.orig +++ ./base/check.h @@ -85,7 +85,7 @@ class BASE_EXPORT CheckError { // Stream for adding optional details to the error message. std::ostream& stream(); - NOMERGE ~CheckError(); + ~CheckError(); CheckError(const CheckError& other) = delete; CheckError& operator=(const CheckError& other) = delete; diff --git a/base/compiler_specific.h b/base/compiler_specific.h index 14a5d6870df43..fa961b0cee1af 100644 --- ./base/compiler_specific.h.orig +++ ./base/compiler_specific.h @@ -340,11 +340,4 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { #endif // defined(__clang_analyzer__) -// Use nomerge attribute to disable optimization of merging multiple same calls. -#if defined(__clang__) && __has_attribute(nomerge) -#define NOMERGE [[clang::nomerge]] -#else -#define NOMERGE -#endif - // Marks a type as being eligible for the "trivial" ABI despite having a