Merge pull request #28218 from CodaFi/curb-cuts

[NFC] Swap the order of checks in redeclaration checking

Author: CodaFi

lib/Sema/TypeCheckDecl.cpp

@@ -710,10 +710,6 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
     if (!conflicting(currentSig, otherSig))
       continue;
 
-    // Skip invalid declarations.
-    if (other->isInvalid())
-      continue;
-
     // Skip declarations in other files.
     // In practice, this means we will warn on a private declaration that
     // shadows a non-private one, but only in the file where the shadowing
@@ -722,6 +718,10 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
     if (!other->isAccessibleFrom(currentDC))
       continue;
 
+    // Skip invalid declarations.
+    if (other->isInvalid())
+      continue;
+
     // Thwart attempts to override the same declaration more than once.
     const auto *currentOverride = current->getOverriddenDecl();
     const auto *otherOverride = other->getOverriddenDecl();