Merge pull request #60541 from xedin/fix-opened-type-printing

[ConstraintSystem] NFC: Check whether opened type has a binding befor…

Author: xedin

include/swift/Sema/ConstraintSystem.h

@@ -1545,6 +1545,10 @@ class Solution {
   /// Retrieve the fixed score of this solution
   Score &getFixedScore() { return FixedScore; }
 
+  /// Check whether this solution has a fixed binding for the given type
+  /// variable.
+  bool hasFixedType(TypeVariableType *typeVar) const;
+
   /// Retrieve the fixed type for the given type variable.
   Type getFixedType(TypeVariableType *typeVar) const;
 

lib/Sema/CSApply.cpp

@@ -53,6 +53,11 @@
 using namespace swift;
 using namespace constraints;
 
+bool Solution::hasFixedType(TypeVariableType *typeVar) const {
+  auto knownBinding = typeBindings.find(typeVar);
+  return knownBinding != typeBindings.end();
+}
+
 /// Retrieve the fixed type for the given type variable.
 Type Solution::getFixedType(TypeVariableType *typeVar) const {
   auto knownBinding = typeBindings.find(typeVar);

lib/Sema/TypeCheckConstraints.cpp

@@ -1362,10 +1362,19 @@ void Solution::dump(raw_ostream &out) const {
             Type(opened.first).print(out, PO);
             out << ")";
             out << " -> ";
-            out << getFixedType(opened.second);
-            out << " [from ";
-            Type(opened.second).print(out, PO);
-            out << "]";
+            // Let's check whether the type variable has been bound.
+            // This is important when solver is working on result
+            // builder transformed code, because dependent sub-components
+            // would not have parent type variables but `OpenedTypes`
+            // cannot be erased, so we'll just print them as unbound.
+            if (hasFixedType(opened.second)) {
+              out << getFixedType(opened.second);
+              out << " [from ";
+              Type(opened.second).print(out, PO);
+              out << "]";
+            } else {
+              Type(opened.second).print(out, PO);
+            }
           },
           [&]() { out << ", "; });
       out << "\n";