Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/swift/Basic/LangOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,9 @@ namespace swift {

/// Disable the component splitter phase of the expression type checker.
bool SolverDisableSplitter = false;

/// Enable the experimental "prepared overloads" optimization.
bool SolverEnablePreparedOverloads = false;
};

/// Options for controlling the behavior of the Clang importer.
Expand Down
6 changes: 6 additions & 0 deletions include/swift/Option/FrontendOptions.td
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,12 @@ def solver_scope_threshold_EQ : Joined<["-"], "solver-scope-threshold=">,
def solver_trail_threshold_EQ : Joined<["-"], "solver-trail-threshold=">,
HelpText<"Expression type checking trail change limit">;

def solver_disable_prepared_overloads : Flag<["-"], "solver-disable-prepared-overloads">,
HelpText<"Disable experimental prepared overloads optimization">;

def solver_enable_prepared_overloads : Flag<["-"], "solver-enable-prepared-overloads">,
HelpText<"Enable experimental prepared overloads optimization">;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not make this an experimental feature so you don't have to extend LangOpts and add new flags?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could, but it’s not a language feature and it’s only temporary (hopefully) so it felt like a misuse of experimental features… hmm.

def solver_disable_splitter : Flag<["-"], "solver-disable-splitter">,
HelpText<"Disable the component splitter phase of expression type checking">;

Expand Down
4 changes: 4 additions & 0 deletions lib/Frontend/CompilerInvocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2000,6 +2000,10 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
if (Args.getLastArg(OPT_solver_disable_splitter))
Opts.SolverDisableSplitter = true;

if (Args.hasArg(OPT_solver_enable_prepared_overloads) ||
Args.hasArg(OPT_solver_disable_prepared_overloads))
Opts.SolverEnablePreparedOverloads = Args.hasArg(OPT_solver_enable_prepared_overloads);

if (FrontendOpts.RequestedAction == FrontendOptions::ActionType::Immediate)
Opts.DeferToRuntime = true;

Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CSSimplify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16737,7 +16737,7 @@ ConstraintSystem::simplifyConstraint(const Constraint &constraint) {
}

// FIXME: Transitional hack.
bool enablePreparedOverloads = false;
bool enablePreparedOverloads = getASTContext().TypeCheckerOpts.SolverEnablePreparedOverloads;

auto *preparedOverload = constraint.getPreparedOverload();
if (!preparedOverload) {
Expand Down