averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3eb82c183662945687f48e11c09828f551b34858' into master-next

Browse Source 
# Conflicts:
#	include/swift/Frontend/FrontendInputsAndOutputs.h
This commit is contained in:
Karoy Lorentey
2020-06-08 16:58:37 -07:00
parent 77cbdeedc8 3eb82c1836
commit 57ea964f2c
580 changed files with 9388 additions and 3418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Frontend/CompilerInvocation.cpp
View File

@@ -724,6 +724,8 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
Opts.SolverEnableOperatorDesignatedTypes |=
Args.hasArg(OPT_solver_enable_operator_designated_types);
Opts.EnableOneWayClosureParameters |=
Args.hasArg(OPT_experimental_one_way_closure_params);
Opts.DebugConstraintSolver |= Args.hasArg(OPT_debug_constraints);
Opts.DebugGenericSignatures |= Args.hasArg(OPT_debug_generic_signatures);
@@ -802,6 +804,8 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts,
Opts.DisableOverlayModules |= Args.hasArg(OPT_emit_imported_modules);
Opts.ExtraArgsOnly |= Args.hasArg(OPT_extra_clang_options_only);
if (const Arg *A = Args.getLastArg(OPT_pch_output_dir)) {
Opts.PrecompiledHeaderOutputDir = A->getValue();
Opts.PCHDisableValidation |= Args.hasArg(OPT_pch_disable_validation);
@@ -863,6 +867,9 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
Opts.DisableModulesValidateSystemDependencies |=
Args.hasArg(OPT_disable_modules_validate_system_headers);
for (auto A: Args.filtered(OPT_swift_module_file)) {
Opts.ExplicitSwiftModules.push_back(resolveSearchPath(A->getValue()));
}
// Opts.RuntimeIncludePath is set by calls to
// setRuntimeIncludePath() or setMainExecutablePath().
// Opts.RuntimeImportPath is set by calls to
@@ -1528,9 +1535,6 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
getRuntimeCompatVersion();
}
if (Args.hasArg(OPT_disable_leaf_frame_pointer_elim))
Opts.DisableFPElimLeaf = true;
return false;
}