Merge pull request #33401 from hborla/join-perf-regression

[ConstraintSystem] Don't update the work list when merging type variables in addJoinConstraint

Author: hborla

lib/Sema/CSSimplify.cpp

@@ -4529,7 +4529,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
           return formUnsolvedResult();
 
         // Merge the equivalence classes corresponding to these two variables.
-        mergeEquivalenceClasses(rep1, rep2);
+        mergeEquivalenceClasses(rep1, rep2, /*updateWorkList=*/true);
         return getTypeMatchSuccess();
       }
 
@@ -4581,7 +4581,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
         if (!rep1->getImpl().canBindToInOut() ||
             !rep2->getImpl().canBindToLValue()) {
           // Merge the equivalence classes corresponding to these two variables.
-          mergeEquivalenceClasses(rep1, rep2);
+          mergeEquivalenceClasses(rep1, rep2, /*updateWorkList=*/true);
           return getTypeMatchSuccess();
         }
       }

lib/Sema/ConstraintSystem.h

@@ -3147,7 +3147,7 @@ class ConstraintSystem {
 
           if (originalRep) {
             if (originalRep != currentRep)
-              mergeEquivalenceClasses(currentRep, originalRep);
+              mergeEquivalenceClasses(currentRep, originalRep, /*updateWorkList=*/false);
             continue;
           }
 
@@ -3443,7 +3443,7 @@ class ConstraintSystem {
   /// distinct.
   void mergeEquivalenceClasses(TypeVariableType *typeVar1,
                                TypeVariableType *typeVar2,
-                               bool updateWorkList = true);
+                               bool updateWorkList);
 
   /// Flags that direct type matching.
   enum TypeMatchFlags {

validation-test/SILOptimizer/large_string_array.swift.gyb

@@ -12,8 +12,6 @@
 // REQUIRES: long_test
 // REQUIRES: CPU=arm64 || CPU=x86_64
 
-// REQUIRES: rdar66807959
-
 // Check if the optimizer can optimize the whole array into a statically
 // initialized global