[compiler-rt] 7f7f3d9 - Revert "Replace bool operator== for VersionType in sanitizer_mac.h" (#135127)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 9 21:09:31 PDT 2025
Author: Jonas Devlieghere
Date: 2025-04-09T21:09:27-07:00
New Revision: 7f7f3d91a2d5c354a5e7b7c6f7d8d71ec6ad1f4d
URL: https://github.com/llvm/llvm-project/commit/7f7f3d91a2d5c354a5e7b7c6f7d8d71ec6ad1f4d
DIFF: https://github.com/llvm/llvm-project/commit/7f7f3d91a2d5c354a5e7b7c6f7d8d71ec6ad1f4d.diff
LOG: Revert "Replace bool operator== for VersionType in sanitizer_mac.h" (#135127)
Reverts llvm/llvm-project#135068 because it breaks building compiler-rt
on Darwin.
https://green.lab.llvm.org/job/clang-stage1-RA/
https://green.lab.llvm.org/job/llvm.org/view/LLDB/job/as-lldb-cmake/
https://green.lab.llvm.org/job/llvm.org/view/LLDB/job/lldb-cmake/
Added:
Modified:
compiler-rt/lib/sanitizer_common/sanitizer_mac.h
Removed:
################################################################################
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.h b/compiler-rt/lib/sanitizer_common/sanitizer_mac.h
index 4de0605e18f03..f0a97d098eea0 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.h
@@ -37,6 +37,9 @@ struct VersionBase {
VersionBase(u16 major, u16 minor) : major(major), minor(minor) {}
+ bool operator==(const VersionType &other) const {
+ return major == other.major && minor == other.minor;
+ }
bool operator>=(const VersionType &other) const {
return major > other.major ||
(major == other.major && minor >= other.minor);
@@ -44,11 +47,6 @@ struct VersionBase {
bool operator<(const VersionType &other) const { return !(*this >= other); }
};
-template <typename VersionType>
-bool operator==(const VersionType &self, const VersionType &other) {
- return self.major == other.major && self.minor == other.minor;
-}
-
struct MacosVersion : VersionBase<MacosVersion> {
MacosVersion(u16 major, u16 minor) : VersionBase(major, minor) {}
};
More information about the llvm-commits
mailing list