Merge pull request #31656 from gribozavr/fix-abstraction-pattern-print-for-cxx

Correctly print an AbstractionPattern with C++ method types

Author: gribozavr

lib/SIL/IR/AbstractionPattern.cpp

@@ -765,22 +765,13 @@ void AbstractionPattern::print(raw_ostream &out) const {
   case Kind::CurriedCFunctionAsMethodType:
   case Kind::PartialCurriedCFunctionAsMethodType:
   case Kind::CFunctionAsMethodType:
-  case Kind::CXXMethodType:
-  case Kind::CurriedCXXMethodType:
-  case Kind::PartialCurriedCXXMethodType:
     out << (getKind() == Kind::ClangType
               ? "AP::ClangType(" :
             getKind() == Kind::CurriedCFunctionAsMethodType
               ? "AP::CurriedCFunctionAsMethodType(" :
-            getKind() == Kind::CFunctionAsMethodType
-              ? "AP::CFunctionAsMethodType(" :
-            getKind() == Kind::CXXMethodType
-              ? "AP::CXXMethodType(" :
-            getKind() == Kind::CurriedCXXMethodType
-              ? "AP::CurriedCXXMethodType(" :
-            getKind() == Kind::PartialCurriedCXXMethodType
-              ? "AP::PartialCurriedCXXMethodType("
-              : "AP::PartialCurriedCFunctionAsMethodType(");
+            getKind() == Kind::PartialCurriedCFunctionAsMethodType
+              ? "AP::PartialCurriedCFunctionAsMethodType("
+              : "AP::CFunctionAsMethodType(");
     if (auto sig = getGenericSignature()) {
       sig->print(out);
     }
@@ -800,6 +791,23 @@ void AbstractionPattern::print(raw_ostream &out) const {
     }
     out << ")";
     return;
+  case Kind::CXXMethodType:
+  case Kind::CurriedCXXMethodType:
+  case Kind::PartialCurriedCXXMethodType:
+    out << (getKind() == Kind::CXXMethodType
+              ? "AP::CXXMethodType(" :
+            getKind() == Kind::CurriedCXXMethodType
+              ? "AP::CurriedCXXMethodType("
+              : "AP::PartialCurriedCXXMethodType");
+    if (auto sig = getGenericSignature()) {
+      sig->print(out);
+    }
+    getType().dump(out);
+    out << ", ";
+    getCXXMethod()->dump();
+    assert(!hasImportAsMemberStatus());
+    out << ")";
+    return;
   case Kind::CurriedObjCMethodType:
   case Kind::PartialCurriedObjCMethodType:
   case Kind::ObjCMethodType: