From 61dadfc894c566ce0af6163159ba0ba76d8007ad Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 15 Oct 2019 22:23:11 +0000 Subject: PR43674: fix incorrect constant evaluation of 'switch' where no case label corresponds to the condition. llvm-svn: 374954 --- clang/lib/AST/ExprConstant.cpp | 2 +- clang/test/SemaCXX/constant-expression-cxx1y.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'clang') diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index 44593350945..a379a335b2f 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -4435,7 +4435,7 @@ static EvalStmtResult EvaluateSwitch(StmtResult &Result, EvalInfo &Info, } 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 2a8304ebda6..614b39533df 100644 --- a/clang/test/SemaCXX/constant-expression-cxx1y.cpp +++ b/clang/test/SemaCXX/constant-expression-cxx1y.cpp @@ -627,6 +627,12 @@ namespace assignment_op { } 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; -- cgit v1.2.3