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

hborla · hborla · commit 4096a62b2aa8 · 2020-08-10T19:56:00.000-07:00
in addJoinConstraint.
diff --git a/lib/Sema/ConstraintSystem.h b/lib/Sema/ConstraintSystem.h
@@ -3147,7 +3147,7 @@ class ConstraintSystem {
 
           if (originalRep) {
             if (originalRep != currentRep)
-              mergeEquivalenceClasses(currentRep, originalRep);
+              mergeEquivalenceClasses(currentRep, originalRep, /*updateWorkList=*/false);
             continue;
           }
 
diff --git a/validation-test/SILOptimizer/large_string_array.swift.gyb b/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
 

Original file line number	Diff line number	Diff line change
`@@ -3147,7 +3147,7 @@ class ConstraintSystem {`
`3147`	`3147`
`3148`	`3148`	`if (originalRep) {`
`3149`	`3149`	`if (originalRep != currentRep)`
`3150`		`- mergeEquivalenceClasses(currentRep, originalRep);`
	`3150`	`+ mergeEquivalenceClasses(currentRep, originalRep, /updateWorkList=/false);`
`3151`	`3151`	`continue;`
`3152`	`3152`	`}`
`3153`	`3153`