Commit c6d28602 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r276350: 

------------------------------------------------------------------------
r276350 | epilk | 2016-07-21 15:31:40 -0700 (Thu, 21 Jul 2016) | 3 lines

[CodeGen] Fix a crash when constant folding switch statement

Differential revision: https://reviews.llvm.org/D22542
------------------------------------------------------------------------

llvm-svn: 276985
parent 00378ef5

clang/lib/CodeGen/CGStmt.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,14 @@ void CodeGenFunction::EmitCaseStmt(const CaseStmt &S) { 
}



void CodeGenFunction::EmitDefaultStmt(const DefaultStmt &S) {

  // If there is no enclosing switch instance that we're aware of, then this

  // default statement can be elided. This situation only happens when we've

  // constant-folded the switch.

  if (!SwitchInsn) {

    EmitStmt(S.getSubStmt());

    return;

  }



  llvm::BasicBlock *DefaultBlock = SwitchInsn->getDefaultDest();

  assert(DefaultBlock->empty() &&

         "EmitDefaultStmt: Default block already defined?");

clang/test/CodeGenCXX/switch-case-folding-2.cpp

+9 −0
Original line number Diff line number Diff line
@@ -18,4 +18,13 @@ int main(void) { 
 return test(5);

}



void other_test() {

  switch(0) {

  case 0:

    do {

    default:;

    } while(0);

  }

}



// CHECK: call i32 (i8*, ...) @_Z6printfPKcz