From d66715d83e64b6bfd0bddebe51874b1b7a64abef Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Mon, 16 Jan 2012 17:35:57 +0000 Subject: [PATCH] Fixes a crash during constant folding of a switch and case statement which has an unscoped case inside it. Patch by Aaron Ballman git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148243 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGStmt.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index 594281d15e..ee4a272ea8 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -878,6 +878,16 @@ void CodeGenFunction::EmitCaseStmtRange(const CaseStmt &S) { } void CodeGenFunction::EmitCaseStmt(const CaseStmt &S) { + // If there is no enclosing switch instance that we're aware of, then this + // case statement and its block can be elided. This situation only happens + // when we've constant-folded the switch, are emitting the constant case, + // and part of the constant case includes another case statement. For + // instance: switch (4) { case 4: do { case 5: } while (1); } + if (!SwitchInsn) { + EmitStmt(S.getSubStmt()); + return; + } + // Handle case ranges. if (S.getRHS()) { EmitCaseStmtRange(S); -- 2.50.1