summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Burgess IV <george.burgess.iv@gmail.com>2016-08-12 04:12:31 +0000
committerGeorge Burgess IV <george.burgess.iv@gmail.com>2016-08-12 04:12:31 +0000
commit53b938da5a39c1d331ed23e00a1d16bf5d1f5aff (patch)
tree3bab88a0e5b30a0171f88d6dfaf61f15fead7cea
parent4f7500bfc223484e376c93292cc80f5be987d1c6 (diff)
downloadbcm5719-llvm-53b938da5a39c1d331ed23e00a1d16bf5d1f5aff.tar.gz
bcm5719-llvm-53b938da5a39c1d331ed23e00a1d16bf5d1f5aff.zip
[Sema] Fix a crash on variadic enable_if functions.
Currently, when trying to evaluate an enable_if condition, we try to evaluate all arguments a user passes to a function. Given that we can't use variadic arguments from said condition anyway, not converting them is a reasonable thing to do. So, this patch makes us ignore any varargs when attempting to check an enable_if condition. We'd crash because, in order to convert an argument, we need its ParmVarDecl. Variadic arguments don't have ParmVarDecls. llvm-svn: 278471
-rw-r--r--clang/lib/Sema/SemaOverload.cpp6
-rw-r--r--clang/test/Sema/enable_if.c21
-rw-r--r--clang/test/SemaCXX/enable_if.cpp23
3 files changed, 49 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 04751d21bfa..ad95a5ca46f 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -5974,8 +5974,12 @@ EnableIfAttr *Sema::CheckEnableIf(FunctionDecl *Function, ArrayRef<Expr *> Args,
SmallVector<Expr *, 16> ConvertedArgs;
bool InitializationFailed = false;
+ // Ignore any variadic parameters. Converting them is pointless, since the
+ // user can't refer to them in the enable_if condition.
+ unsigned ArgSizeNoVarargs = std::min(Function->param_size(), Args.size());
+
// Convert the arguments.
- for (unsigned I = 0, E = Args.size(); I != E; ++I) {
+ for (unsigned I = 0; I != ArgSizeNoVarargs; ++I) {
ExprResult R;
if (I == 0 && !MissingImplicitThis && isa<CXXMethodDecl>(Function) &&
!cast<CXXMethodDecl>(Function)->isStatic() &&
diff --git a/clang/test/Sema/enable_if.c b/clang/test/Sema/enable_if.c
index 1cc14659021..a11f53eb493 100644
--- a/clang/test/Sema/enable_if.c
+++ b/clang/test/Sema/enable_if.c
@@ -149,4 +149,25 @@ void PR27122_ext() {
regular_enable_if(1, 2); // expected-error{{too many arguments}}
regular_enable_if(); // expected-error{{too few arguments}}
}
+
+// We had a bug where we'd crash upon trying to evaluate varargs.
+void variadic_enable_if(int a, ...) __attribute__((enable_if(a, ""))); // expected-note 6 {{disabled}}
+void variadic_test() {
+ variadic_enable_if(1);
+ variadic_enable_if(1, 2);
+ variadic_enable_if(1, "c", 3);
+
+ variadic_enable_if(0); // expected-error{{no matching}}
+ variadic_enable_if(0, 2); // expected-error{{no matching}}
+ variadic_enable_if(0, "c", 3); // expected-error{{no matching}}
+
+ int m;
+ variadic_enable_if(1);
+ variadic_enable_if(1, m);
+ variadic_enable_if(1, m, "c");
+
+ variadic_enable_if(0); // expected-error{{no matching}}
+ variadic_enable_if(0, m); // expected-error{{no matching}}
+ variadic_enable_if(0, m, 3); // expected-error{{no matching}}
+}
#endif
diff --git a/clang/test/SemaCXX/enable_if.cpp b/clang/test/SemaCXX/enable_if.cpp
index 7ec07aa8b0c..81308136c48 100644
--- a/clang/test/SemaCXX/enable_if.cpp
+++ b/clang/test/SemaCXX/enable_if.cpp
@@ -417,3 +417,26 @@ template <int N> constexpr int callTemplated() { return templated<N>(); }
constexpr int B = callTemplated<0>(); // expected-error{{initialized by a constant expression}} expected-error@-2{{no matching function for call to 'templated'}} expected-note{{in instantiation of function template}} expected-note@-9{{candidate disabled}}
static_assert(callTemplated<1>() == 1, "");
}
+
+namespace variadic {
+void foo(int a, int b = 0, ...) __attribute__((enable_if(a && b, ""))); // expected-note 6{{disabled}}
+
+void testFoo() {
+ foo(1, 1);
+ foo(1, 1, 2);
+ foo(1, 1, 2, 3);
+
+ foo(1, 0); // expected-error{{no matching}}
+ foo(1, 0, 2); // expected-error{{no matching}}
+ foo(1, 0, 2, 3); // expected-error{{no matching}}
+
+ int m;
+ foo(1, 1);
+ foo(1, 1, m);
+ foo(1, 1, m, 3);
+
+ foo(1, 0); // expected-error{{no matching}}
+ foo(1, 0, m); // expected-error{{no matching}}
+ foo(1, 0, m, 3); // expected-error{{no matching}}
+}
+}
OpenPOWER on IntegriCloud