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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-04-28 22:51:25 -07:00
parent 9997fddb3a 0ecf8a98bb
commit 33c6939430
23 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1570,7 +1570,7 @@ bool ParseMigratorArgs(MigratorOptions &Opts, llvm::Triple &Triple,
DiagnosticEngine &Diags) {
using namespace options;
Opts.AddObjC |= Args.hasArg(OPT_warn_swift3_objc_inference);
Opts.KeepObjcVisibility |= Args.hasArg(OPT_migrate_keep_objc_visibility);
Opts.DumpUsr = Args.hasArg(OPT_dump_usr);
if (Args.hasArg(OPT_disable_migrator_fixits)) {