Merge pull request #82700 from nate-chandler/cherrypick/release/6.2/rdar154652254

6.2: [CSE] Fix combine of type_value.

Author: nate-chandler

lib/SILOptimizer/Transforms/CSE.cpp

@@ -520,10 +520,7 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {
   }
 
   hash_code visitTypeValueInst(TypeValueInst *X) {
-    OperandValueArrayRef Operands(X->getAllOperands());
-    return llvm::hash_combine(
-        X->getKind(), X->getType(),
-        llvm::hash_combine_range(Operands.begin(), Operands.end()));
+    return llvm::hash_combine(X->getKind(), X->getType(), X->getParamType());
   }
 };
 } // end anonymous namespace
@@ -568,6 +565,13 @@ bool llvm::DenseMapInfo<SimpleValue>::isEqual(SimpleValue LHS,
 
     return true;
   }
+  auto *ltvi = dyn_cast<TypeValueInst>(LHSI);
+  auto *rtvi = dyn_cast<TypeValueInst>(RHSI);
+  if (ltvi && rtvi) {
+    if (ltvi->getType() != rtvi->getType())
+      return false;
+    return ltvi->getParamType() == rtvi->getParamType();
+  }
   auto opCmp = [&](const Operand *op1, const Operand *op2) -> bool {
     if (op1 == op2)
       return true;

test/SILOptimizer/cse.sil

@@ -1447,4 +1447,3 @@ bb0:
   %r1 = tuple ()
   return %r1 : $()
 }
-

test/SILOptimizer/cse_ossa.sil

@@ -1351,3 +1351,16 @@ bb0(%0 : $*InlineArray<N, Int>, %1 : $Int):
   return %14
 }
 
+struct Pair<let x: Int, let y: Int> {}
+// CHECK-LABEL: sil [ossa] @dont_cse_different_type_values : {{.*}} {
+// CHECK:         type_value
+// CHECK:         type_value
+// CHECK-LABEL: } // end sil function 'dont_cse_different_type_values'
+sil [ossa] @dont_cse_different_type_values : $@convention(method) <let x : Int, let y : Int> (Pair<x, y>) -> (Int, Int) {
+[global: ]
+bb0(%0 : $Pair<x, y>):
+  %2 = type_value $Int for x
+  %3 = type_value $Int for y
+  %4 = tuple (%2, %3)
+  return %4
+}