Sema: Replace sole usage of TypeDecl::hasMarking() with getDirectlyInheritedNominalTypeDecls()

Author: slavapestov

include/swift/AST/Decl.h

@@ -4373,10 +4373,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Type if it `isEscapable` instead of using this.
   CanBeInvertible::Result canBeEscapable() const;
 
-  /// Determine whether this type has `: <target>` stated explicitly in
-  /// its inheritance clause.
-  bool hasMarking(InvertibleProtocolKind target) const;
-
   /// Determine whether this type has ~<target>` stated on
   /// itself, one of its inherited types or `Self` requirements.
   InverseMarking::Mark hasInverseMarking(InvertibleProtocolKind target) const;

lib/AST/Decl.cpp

@@ -6652,33 +6652,6 @@ findInverseInInheritance(InheritedTypes inherited,
   return inverse;
 }
 
-bool NominalTypeDecl::hasMarking(InvertibleProtocolKind target) const {
-  InverseMarking::Mark mark;
-
-  std::function<bool(Type)> isTarget = [&](Type t) -> bool {
-    if (auto kp = t->getKnownProtocol()) {
-      if (auto ip = getInvertibleProtocolKind(*kp))
-        return *ip == target;
-    } else if (auto pct = t->getAs<ProtocolCompositionType>()) {
-      return llvm::any_of(pct->getMembers(), isTarget);
-    }
-
-    return false;
-  };
-
-  findInheritedType(getInherited(),
-                    [&](Type inheritedTy, NullablePtr<TypeRepr> repr) {
-                      if (!isTarget(inheritedTy))
-                        return false;
-
-                      mark = InverseMarking::Mark(
-                          InverseMarking::Kind::Explicit,
-                          repr.isNull() ? SourceLoc() : repr.get()->getLoc());
-                      return true;
-                    });
-  return mark;
-}
-
 InverseMarking::Mark
 AssociatedTypeDecl::hasInverseMarking(InvertibleProtocolKind target) const {
   auto &ctx = getASTContext();

lib/Sema/TypeCheckInvertible.cpp

@@ -60,8 +60,16 @@ static void emitAdviceToApplyInverseAfter(InFlightDiagnostic &&diag,
   diag.flush();
 
   // Have no advice for situations where the KP conformance is explicit.
-  if (nominal->hasMarking(ip))
-    return;
+  InvertibleProtocolSet inverses;
+  bool anyObject = false;
+  auto inheritedNominals = getDirectlyInheritedNominalTypeDecls(
+      nominal, inverses, anyObject);
+  for (auto entry : inheritedNominals) {
+    if (auto *otherProto = dyn_cast<ProtocolDecl>(entry.Item)) {
+      if (otherProto->isSpecificProtocol(kp))
+        return;
+    }
+  }
 
   auto &ctx = nominal->getASTContext();