diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 7 | ||||
| -rw-r--r-- | test/SemaCXX/attr-nonnull.cpp | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 91d02dacc8..e1c3d6839d 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -10336,6 +10336,13 @@ Sema::CreateOverloadedBinOp(SourceLocation OpLoc, FnDecl)) return ExprError(); + ArrayRef<const Expr *> ArgsArray(Args, 2); + // Cut off the implicit 'this'. + if (isa<CXXMethodDecl>(FnDecl)) + ArgsArray = ArgsArray.slice(1); + checkCall(FnDecl, ArgsArray, 0, isa<CXXMethodDecl>(FnDecl), OpLoc, + TheCall->getSourceRange(), VariadicDoesNotApply); + return MaybeBindToTemporary(TheCall); } else { // We matched a built-in operator. Convert the arguments, then diff --git a/test/SemaCXX/attr-nonnull.cpp b/test/SemaCXX/attr-nonnull.cpp index 76e1b74068..8af49d9d29 100644 --- a/test/SemaCXX/attr-nonnull.cpp +++ b/test/SemaCXX/attr-nonnull.cpp @@ -40,3 +40,15 @@ void g() { f(static_cast<char*>(0)); // expected-warning{{null passed}} } } + +namespace test4 { +struct X { + bool operator!=(const void *) const __attribute__((nonnull(2))); +}; +bool operator==(const X&, const void *) __attribute__((nonnull(2))); + +void test(const X& x) { + (void)(x == 0); // expected-warning{{null passed}} + (void)(x != 0); // expected-warning{{null passed}} +} +} |