summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2012-07-20 20:40:35 +0000
committerAaron Ballman <aaron@aaronballman.com>2012-07-20 20:40:35 +0000
commit9bca21ed25c98c2a2cfea1a02d36b2a753e3a145 (patch)
tree91be034874b76a8d6bac6e2560ff665f207de3e0
parent66a00c765fc14358ff0dac66365a753ee05014a2 (diff)
downloadbcm5719-llvm-9bca21ed25c98c2a2cfea1a02d36b2a753e3a145.tar.gz
bcm5719-llvm-9bca21ed25c98c2a2cfea1a02d36b2a753e3a145.zip
No longer assuming the number of prototype arguments is always less than the number of formal parameters for a variadic function call.
llvm-svn: 160570
-rw-r--r--clang/lib/Sema/SemaOverload.cpp2
-rw-r--r--clang/test/SemaCXX/member-operator-expr.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 9420b73d8b8..b80e374b607 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -10998,7 +10998,7 @@ Sema::BuildCallToObjectOfClassType(Scope *S, Expr *Obj,
// If this is a variadic call, handle args passed through "...".
if (Proto->isVariadic()) {
// Promote the arguments (C99 6.5.2.2p7).
- for (unsigned i = NumArgsInProto; i != NumArgs; i++) {
+ for (unsigned i = NumArgsInProto; i < NumArgs; i++) {
ExprResult Arg = DefaultVariadicArgumentPromotion(Args[i], VariadicMethod, 0);
IsError |= Arg.isInvalid();
TheCall->setArg(i + 1, Arg.take());
diff --git a/clang/test/SemaCXX/member-operator-expr.cpp b/clang/test/SemaCXX/member-operator-expr.cpp
index ae5f8bb0ddb..c98ef739970 100644
--- a/clang/test/SemaCXX/member-operator-expr.cpp
+++ b/clang/test/SemaCXX/member-operator-expr.cpp
@@ -27,3 +27,8 @@ void test2() {
x->operator float(); // expected-error{{no member named 'operator float'}}
x->operator; // expected-error{{expected a type}}
}
+
+namespace pr13157 {
+ class A { public: void operator()(int x, int y = 2, ...) {} };
+ void f() { A()(1); }
+} \ No newline at end of file
OpenPOWER on IntegriCloud