commit dd4ae3f16a09719220806cc1e0f2a16ddcc5fa24
author Douglas Gregor <doug.gregor@gmail.com> Tue May 19 22:43:30 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Tue May 19 22:43:30 2009 +0000
tree c16c5c2fd1b80f6e1075c5b814ceaf7c0ed99f1a
parent e621150f8912706269f94b652d974107176f7ab3

Template instantiation for __builtin_choose_expr.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72143 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index bb85455..d268658 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -5043,7 +5043,7 @@
   assert((CondExpr && LHSExpr && RHSExpr) && "Missing type argument(s)");
 
   QualType resType;
-  if (CondExpr->isValueDependent()) {
+  if (CondExpr->isTypeDependent() || CondExpr->isValueDependent()) {
     resType = Context.DependentTy;
   } else {
     // The conditional expression is required to be a constant expression.