ogoffart added a comment. I believe only the change in ActOnFinishSwitchStmt might be controversial. Is it breaking an invariant than having switches kept in the AST? https://reviews.llvm.org/D26350