diff options
| -rw-r--r-- | lib/Sema/Sema.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp index 7b9f5909d1..533b21cb43 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -894,8 +894,8 @@ bool Sema::isExprCallable(const Expr &E, QualType &ZeroArgCallReturnTy, } } - // Ignore overloads that are the pointer-to-member. - if (FR.IsAddressOfOperand && FR.HasFormOfMemberPointer) + // Ignore overloads that are pointer-to-member constants. + if (FR.HasFormOfMemberPointer) return false; return true; diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index bfe98498d8..3818e3d3a1 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -3550,7 +3550,7 @@ Sema::ActOnCallExpr(Scope *S, Expr *Fn, SourceLocation LParenLoc, OverloadExpr::FindResult find = OverloadExpr::find(Fn); // We aren't supposed to apply this logic for if there's an '&' involved. - if (!(find.IsAddressOfOperand && find.HasFormOfMemberPointer)) { + if (!find.HasFormOfMemberPointer) { OverloadExpr *ovl = find.Expression; if (isa<UnresolvedLookupExpr>(ovl)) { UnresolvedLookupExpr *ULE = cast<UnresolvedLookupExpr>(ovl); |