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

This commit is contained in:
swift-ci
2018-07-30 20:59:23 -07:00
25 changed files with 712 additions and 133 deletions

View File

@@ -1391,6 +1391,7 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
case options::OPT_dump_type_refinement_contexts:
case options::OPT_dump_scope_maps:
case options::OPT_dump_interface_hash:
case options::OPT_dump_type_info:
case options::OPT_verify_debug_info:
OI.CompilerOutputType = file_types::TY_Nothing;
break;