commit f0202ca775b31447f66c8a45797cc433c467afa3
author Nick Lewycky <nicholas@mxc.ca> Tue Dec 16 06:12:01 2014 +0000
committer Nick Lewycky <nicholas@mxc.ca> Tue Dec 16 06:12:01 2014 +0000
tree b0b91e4173d41af22499dfe2b7dae01df9655d0a
parent 417fc6b3034b76340b15141d0187ba7114580ea6

Improve handling of value dependent expressions in __attribute__((enable_if)), both in the condition expression and at the call site. Fixes PR20988!

llvm-svn: 224320

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index ad36e76..59b8e98 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -9088,7 +9088,8 @@
   ArgVector ArgValues(Args.size());
   for (ArrayRef<const Expr*>::iterator I = Args.begin(), E = Args.end();
        I != E; ++I) {
-    if (!Evaluate(ArgValues[I - Args.begin()], Info, *I))
+    if ((*I)->isValueDependent() ||
+        !Evaluate(ArgValues[I - Args.begin()], Info, *I))
       // If evaluation fails, throw away the argument entirely.
       ArgValues[I - Args.begin()] = APValue();
     if (Info.EvalStatus.HasSideEffects)