Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions clang/include/clang/Sema/Overload.h
Original file line number Diff line number Diff line change
Expand Up @@ -1202,12 +1202,12 @@ class Sema;

/// Would use of this function result in a rewrite using a different
/// operator?
bool isRewrittenOperator(const FunctionDecl *FD) {
bool isRewrittenOperator(const FunctionDecl *FD) const {
return OriginalOperator &&
FD->getDeclName().getCXXOverloadedOperator() != OriginalOperator;
}

bool isAcceptableCandidate(const FunctionDecl *FD) {
bool isAcceptableCandidate(const FunctionDecl *FD) const {
if (!OriginalOperator)
return true;

Expand All @@ -1234,21 +1234,21 @@ class Sema;
}
/// Determines whether this operator could be implemented by a function
/// with reversed parameter order.
bool isReversible() {
bool isReversible() const {
return AllowRewrittenCandidates && OriginalOperator &&
(getRewrittenOverloadedOperator(OriginalOperator) != OO_None ||
allowsReversed(OriginalOperator));
}

/// Determine whether reversing parameter order is allowed for operator
/// Op.
bool allowsReversed(OverloadedOperatorKind Op);
bool allowsReversed(OverloadedOperatorKind Op) const;

/// Determine whether we should add a rewritten candidate for \p FD with
/// reversed parameter order.
/// \param OriginalArgs are the original non reversed arguments.
bool shouldAddReversed(Sema &S, ArrayRef<Expr *> OriginalArgs,
FunctionDecl *FD);
FunctionDecl *FD) const;
};

private:
Expand Down
4 changes: 2 additions & 2 deletions clang/lib/Sema/SemaOverload.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1087,14 +1087,14 @@ static bool shouldAddReversedEqEq(Sema &S, SourceLocation OpLoc,
}

bool OverloadCandidateSet::OperatorRewriteInfo::allowsReversed(
OverloadedOperatorKind Op) {
OverloadedOperatorKind Op) const {
if (!AllowRewrittenCandidates)
return false;
return Op == OO_EqualEqual || Op == OO_Spaceship;
}

bool OverloadCandidateSet::OperatorRewriteInfo::shouldAddReversed(
Sema &S, ArrayRef<Expr *> OriginalArgs, FunctionDecl *FD) {
Sema &S, ArrayRef<Expr *> OriginalArgs, FunctionDecl *FD) const {
auto Op = FD->getOverloadedOperator();
if (!allowsReversed(Op))
return false;
Expand Down
Loading