Merge pull request #19698 from rudkx/designated-protocols

[ConstraintSystem] Use operator designated protocols to speed type checking.

Author: rudkx

include/swift/Basic/LangOptions.h

@@ -122,9 +122,6 @@ namespace swift {
     /// completions.
     bool CodeCompleteCallPatternHeuristics = false;
 
-    /// Disable constraint system performance hacks.
-    bool DisableConstraintSolverPerformanceHacks = false;
-
     ///
     /// Flags for use by tests
     ///
@@ -193,6 +190,16 @@ namespace swift {
     /// Disable the shrink phase of the expression type checker.
     bool SolverDisableShrink = false;
 
+    /// Disable constraint system performance hacks.
+    bool DisableConstraintSolverPerformanceHacks = false;
+
+    /// \brief Enable experimental operator protocol designator feature.
+    bool EnableOperatorDesignatedProtocols = false;
+
+    /// \brief Enable constraint solver support for experimental
+    ///        operator protocol designator feature.
+    bool SolverEnableOperatorDesignatedProtocols = false;
+
     /// The maximum depth to which to test decl circularity.
     unsigned MaxCircularityDepth = 500;
 
@@ -203,9 +210,6 @@ namespace swift {
     /// \brief Enable experimental property behavior feature.
     bool EnableExperimentalPropertyBehaviors = false;
 
-    /// \brief Enable experimental operator protocol designator feature.
-    bool EnableOperatorDesignatedProtocols = false;
-
     /// \brief Staging flag for treating inout parameters as Thread Sanitizer
     /// accesses.
     bool DisableTsanInoutInstrumentation = false;

include/swift/Option/FrontendOptions.td

@@ -197,9 +197,6 @@ def debug_time_function_bodies : Flag<["-"], "debug-time-function-bodies">,
 def debug_time_expression_type_checking : Flag<["-"], "debug-time-expression-type-checking">,
   HelpText<"Dumps the time it takes to type-check each expression">;
 
-def disable_constraint_solver_performance_hacks : Flag<["-"], "disable-constraint-solver-performance-hacks">,
-  HelpText<"Disable all the hacks in the constraint solver">;
-
 def debug_assert_immediately : Flag<["-"], "debug-assert-immediately">,
   DebugCrashOpt, HelpText<"Force an assertion failure immediately">;
 def debug_assert_after_parse : Flag<["-"], "debug-assert-after-parse">,
@@ -309,10 +306,6 @@ def enable_experimental_property_behaviors :
   Flag<["-"], "enable-experimental-property-behaviors">,
   HelpText<"Enable experimental property behaviors">;
 
-def enable_operator_designated_protocols :
-  Flag<["-"], "enable-operator-designated-protocols">,
-  HelpText<"Enable operator designated protocols">;
-
 def enable_deserialization_recovery :
   Flag<["-"], "enable-deserialization-recovery">,
   HelpText<"Attempt to recover from missing xrefs (etc) in swiftmodules">;
@@ -376,6 +369,17 @@ def solver_disable_shrink :
   Flag<["-"], "solver-disable-shrink">,
   HelpText<"Disable the shrink phase of expression type checking">;
 
+def disable_constraint_solver_performance_hacks : Flag<["-"], "disable-constraint-solver-performance-hacks">,
+  HelpText<"Disable all the hacks in the constraint solver">;
+
+def enable_operator_designated_protocols :
+  Flag<["-"], "enable-operator-designated-protocols">,
+  HelpText<"Enable operator designated protocols">;
+
+def solver_enable_operator_designated_protocols :
+  Flag<["-"], "solver-enable-operator-designated-protocols">,
+  HelpText<"Enable operator designated protocols in constraint solver">;
+
 def switch_checking_invocation_threshold_EQ : Joined<["-"],
     "switch-checking-invocation-threshold=">;
 

lib/Frontend/CompilerInvocation.cpp

@@ -164,6 +164,9 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableOperatorDesignatedProtocols |=
       Args.hasArg(OPT_enable_operator_designated_protocols);
 
+  Opts.SolverEnableOperatorDesignatedProtocols |=
+      Args.hasArg(OPT_solver_enable_operator_designated_protocols);
+
   if (auto A = Args.getLastArg(OPT_enable_deserialization_recovery,
                                OPT_disable_deserialization_recovery)) {
     Opts.EnableDeserializationRecovery