RequirementMachine: Use Requirement::hasError() method

Author: slavapestov

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -692,12 +692,12 @@ bool swift::rewriting::diagnoseRequirementErrors(
 
     switch (error.kind) {
     case RequirementError::Kind::InvalidTypeRequirement: {
+      if (error.requirement.hasError())
+        break;
+
       Type subjectType = error.requirement.getFirstType();
       Type constraint = error.requirement.getSecondType();
 
-      if (subjectType->hasError() || constraint->hasError())
-        break;
-
       ctx.Diags.diagnose(loc, diag::requires_conformance_nonprotocol,
                          subjectType, constraint);
       diagnosedError = true;
@@ -726,10 +726,11 @@ bool swift::rewriting::diagnoseRequirementErrors(
     }
 
     case RequirementError::Kind::InvalidRequirementSubject: {
-      auto subjectType = error.requirement.getFirstType();
-      if (subjectType->hasError())
+      if (error.requirement.hasError())
         break;
 
+      auto subjectType = error.requirement.getFirstType();
+
       ctx.Diags.diagnose(loc, diag::requires_not_suitable_archetype,
                          subjectType);
       diagnosedError = true;
@@ -740,24 +741,16 @@ bool swift::rewriting::diagnoseRequirementErrors(
       auto requirement = error.requirement;
       auto conflict = error.conflictingRequirement;
 
-      if (requirement.getFirstType()->hasError() ||
-          (requirement.getKind() != RequirementKind::Layout &&
-           requirement.getSecondType()->hasError())) {
-        // Don't emit a cascading error.
+      if (requirement.hasError())
         break;
-      }
 
       if (!conflict) {
         ctx.Diags.diagnose(loc, diag::requires_same_concrete_type,
                            requirement.getFirstType(),
                            requirement.getSecondType());
       } else {
-        if (conflict->getFirstType()->hasError() ||
-            (conflict->getKind() != RequirementKind::Layout &&
-             conflict->getSecondType()->hasError())) {
-          // Don't emit a cascading error.
+        if (conflict->hasError())
           break;
-        }
 
         auto options = PrintOptions::forDiagnosticArguments();
         std::string requirements;
@@ -778,12 +771,8 @@ bool swift::rewriting::diagnoseRequirementErrors(
 
     case RequirementError::Kind::RedundantRequirement: {
       auto requirement = error.requirement;
-      if (requirement.getFirstType()->hasError() ||
-          (requirement.getKind() != RequirementKind::Layout &&
-           requirement.getSecondType()->hasError())) {
-        // Don't emit a cascading error.
+      if (requirement.hasError())
         break;
-      }
 
       switch (requirement.getKind()) {
       case RequirementKind::SameType: