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

Manually merge origin/main into origin/next.

Browse Source 
Resolved conflict in lib/ClangImporter/ImportType.cpp.
This commit is contained in:
Varun Gandhi
2020-09-23 08:10:08 -07:00
parent dd214fc05e 13f8641410
commit 37efac9ff8
62 changed files with 1181 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1142,6 +1142,8 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil);
Opts.EmitSortedSIL |= Args.hasArg(OPT_emit_sorted_sil);
Opts.PrintFullConvention |=
Args.hasArg(OPT_experimental_print_full_convention);
Opts.PrintInstCounts |= Args.hasArg(OPT_print_inst_counts);
Opts.StopOptimizationBeforeLoweringOwnership |=
Args.hasArg(OPT_sil_stop_optzns_before_lowering_ownership);