Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2017-04-18 14:08:30 -07:00
28 changed files with 26 additions and 38 deletions

View File

@@ -321,7 +321,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Action = FrontendOptions::REPL;
} else if (Opt.matches(OPT_interpret)) {
Action = FrontendOptions::Immediate;
} else if(Opt.matches(OPT_update_code)) {
} else if (Opt.matches(OPT_update_code)) {
Action = FrontendOptions::UpdateCode;
} else {
llvm_unreachable("Unhandled mode option");