Skip to content

Commit d51a465

Browse files
committed
IRGen: Enable the new llvm pass manager
rdar://96687157
1 parent 83d9781 commit d51a465

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

include/swift/AST/IRGenOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ class IRGenOptions {
446446
IRGenOptions()
447447
: DWARFVersion(2),
448448
OutputKind(IRGenOutputKind::LLVMAssemblyAfterOptimization),
449-
Verify(true), LegacyPassManager(1), OptMode(OptimizationMode::NotSet),
449+
Verify(true), LegacyPassManager(0), OptMode(OptimizationMode::NotSet),
450450
Sanitizers(OptionSet<SanitizerKind>()),
451451
SanitizersWithRecoveryInstrumentation(OptionSet<SanitizerKind>()),
452452
SanitizeAddressUseODRIndicator(false),

include/swift/Option/FrontendOptions.td

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,5 +1079,8 @@ def concurrency_model_EQ :
10791079

10801080
def enable_new_llvm_pass_manager :
10811081
Flag<["-"], "enable-new-llvm-pass-manager">,
1082-
HelpText<"Enable new llvm pass manager">;
1082+
HelpText<"Enable the new llvm pass manager">;
1083+
def disable_new_llvm_pass_manager :
1084+
Flag<["-"], "disable-new-llvm-pass-manager">,
1085+
HelpText<"Disable the new llvm pass manager">;
10831086
} // end let Flags = [FrontendOption, NoDriverOption, HelpHidden]

lib/Frontend/CompilerInvocation.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,8 +2389,10 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
23892389
Opts.SwiftAsyncFramePointer = SwiftAsyncFramePointerKind::Never;
23902390
}
23912391

2392-
if (Args.hasArg(OPT_enable_new_llvm_pass_manager))
2393-
Opts.LegacyPassManager = false;
2392+
Opts.LegacyPassManager =
2393+
Args.hasFlag(OPT_disable_new_llvm_pass_manager,
2394+
OPT_enable_new_llvm_pass_manager,
2395+
Opts.LegacyPassManager);
23942396

23952397
return false;
23962398
}

0 commit comments

Comments
 (0)