[AST] NonCopyableGenerics: Remove a few uses for getMarking(...).getPositive()

Author: xedin

lib/AST/Decl.cpp

@@ -4945,21 +4945,19 @@ conformanceExists(TypeDecl const *decl, InvertibleProtocolKind ip) {
 
 TypeDecl::CanBeInvertible::Result TypeDecl::canBeCopyable() const {
   if (!getASTContext().LangOpts.hasFeature(Feature::NoncopyableGenerics)) {
-    auto copyable = getMarking(InvertibleProtocolKind::Copyable);
-    return !copyable.getInverse() || bool(copyable.getPositive())
-         ? CanBeInvertible::Always
-         : CanBeInvertible::Never;
+    return !hasInverseMarking(InvertibleProtocolKind::Copyable)
+               ? CanBeInvertible::Always
+               : CanBeInvertible::Never;
   }
 
   return conformanceExists(this, InvertibleProtocolKind::Copyable);
 }
 
 TypeDecl::CanBeInvertible::Result TypeDecl::canBeEscapable() const {
   if (!getASTContext().LangOpts.hasFeature(Feature::NoncopyableGenerics)) {
-    auto escapable = getMarking(InvertibleProtocolKind::Escapable);
-    return !escapable.getInverse() || bool(escapable.getPositive())
-         ? CanBeInvertible::Always
-         : CanBeInvertible::Never;
+    return !hasInverseMarking(InvertibleProtocolKind::Escapable)
+               ? CanBeInvertible::Always
+               : CanBeInvertible::Never;
   }
 
   return conformanceExists(this, InvertibleProtocolKind::Escapable);

lib/AST/ProtocolConformance.cpp

@@ -1095,8 +1095,7 @@ void NominalTypeDecl::prepareConformanceTable() const {
     if (!isa<ClassDecl>(this)) {
       bool missingOne = false;
       for (auto ip : InvertibleProtocolSet::full()) {
-        auto invertible = getMarking(ip);
-        if (!invertible.getInverse() || bool(invertible.getPositive()))
+        if (!hasInverseMarking(ip))
           addSynthesized(ctx.getProtocol(getKnownProtocolKind(ip)));
         else
           missingOne = true;