PR43674: fix incorrect constant evaluation of 'switch' where no case
label corresponds to the condition.
llvm-svn: 374954
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 4459335..a379a335 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -4435,7 +4435,7 @@
}
if (!Found)
- return Scope.destroy() ? ESR_Failed : ESR_Succeeded;
+ return Scope.destroy() ? ESR_Succeeded : ESR_Failed;
// Search the switch body for the switch case and evaluate it from there.
EvalStmtResult ESR = EvaluateStmt(Result, Info, SS->getBody(), Found);
diff --git a/clang/test/SemaCXX/constant-expression-cxx1y.cpp b/clang/test/SemaCXX/constant-expression-cxx1y.cpp
index 2a8304eb..614b395 100644
--- a/clang/test/SemaCXX/constant-expression-cxx1y.cpp
+++ b/clang/test/SemaCXX/constant-expression-cxx1y.cpp
@@ -627,6 +627,12 @@
}
namespace switch_stmt {
+ constexpr bool no_such_case(int n) {
+ switch (n) { case 1: return false; }
+ return true;
+ }
+ static_assert(no_such_case(0), "");
+
constexpr int f(char k) {
bool b = false;
int z = 6;
