summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2012-01-25 01:05:57 +0000
committerEli Friedman <eli.friedman@gmail.com>2012-01-25 01:05:57 +0000
commita59b1907cc551d33f680335ca84037eff2663448 (patch)
tree6444e0767d7fb44d2da8ab5abdcdf48357ecb376 /clang/lib/Sema/SemaExprCXX.cpp
parent9aa95b16e151e50edb0aec4b7a0dfb370d2732e8 (diff)
downloadbcm5719-llvm-a59b1907cc551d33f680335ca84037eff2663448.tar.gz
bcm5719-llvm-a59b1907cc551d33f680335ca84037eff2663448.zip
Make sure we correctly treat __is_convertible_to as an unevaluated context. PR11833.
llvm-svn: 148893
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 1b08aa2159d..5c00e70af6d 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -3166,8 +3166,9 @@ static bool EvaluateBinaryTypeTrait(Sema &Self, BinaryTypeTrait BTT,
InitializationKind Kind(InitializationKind::CreateCopy(KeyLoc,
SourceLocation()));
- // Perform the initialization within a SFINAE trap at translation unit
- // scope.
+ // Perform the initialization in an unevaluated context within a SFINAE
+ // trap at translation unit scope.
+ EnterExpressionEvaluationContext Unevaluated(Self, Sema::Unevaluated);
Sema::SFINAETrap SFINAE(Self, /*AccessCheckingSFINAE=*/true);
Sema::ContextRAII TUContext(Self, Self.Context.getTranslationUnitDecl());
InitializationSequence Init(Self, To, Kind, &FromPtr, 1);
OpenPOWER on IntegriCloud