Skip to content

Replace bool operator== for VersionType in sanitizer_mac.h #135068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
googlewalt merged 2 commits into from
Apr 9, 2025
Merged

Replace bool operator== for VersionType in sanitizer_mac.h #135068

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d471bf4
Replace bool operator== for VersionType in sanitizer_mac.h
itf Apr 9, 2025
6202d55
Update sanitizer_mac.h
itf Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler-rt/lib/sanitizer_common/sanitizer_mac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ struct VersionBase {

VersionBase(u16 major, u16 minor) : major(major), minor(minor) {}

bool operator==(const VersionType &other) const {
return major == other.major && minor == other.minor;
friend bool operator==(const VersionType &self, const VersionType &other) {
Copy link
Collaborator

@vitalybuka vitalybuka Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fields are public, it does not need need to be fried or even a method

Copy link
Contributor Author

@itf itf Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to access VersionType without it being a method? If we didn't depend on the template for the comparison, it would be simple.

And without it being a friend, I'm unsure how to create a symmetric binary operator. Removing "friend" would cause it to have 3 parameters, and if we remove &self, we go back to the original issue we are trying to fix.

Copy link
Contributor

@googlewalt googlewalt Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You want a standalone function, defined outside of the struct:

template <typename VersionType>
bool operator==(const VersionType &self, const VersionType &other) {
  return self.major == other.major && self.minor == other.minor;
}

return self.major == other.major && self.minor == other.minor;
}
bool operator>=(const VersionType &other) const {
return major > other.major ||
Expand Down