Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/AST/ASTVerifier.cpp

@@ -2362,14 +2362,6 @@ class Verifier : public ASTWalker {
         }
       }
 
-      if (VD->isFinal() != VD->getAttrs().hasAttribute<FinalAttr>()) {
-        Out << "decl should be final iff it has FinalAttr, but isFinal() = "
-            << VD->isFinal() << " and hasAttribute<FinalAttr>() = "
-            << VD->getAttrs().hasAttribute<FinalAttr>() << "\n";
-        VD->dump(Out);
-        abort();
-      }
-
       verifyCheckedBase(VD);
     }