ASTScope: Remove crossCheckWithAST()

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -496,7 +496,6 @@ class ASTSourceFileScope final : public ASTScopeImpl {
 
   const SourceFile *getSourceFile() const override;
   NullablePtr<const void> addressForPrinting() const override { return SF; }
-  bool crossCheckWithAST();
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;

lib/AST/ASTScopeCreation.cpp

@@ -462,67 +462,6 @@ class ScopeCreator final {
     return -1 == signum;
   }
 
-public:
-  /// For debugging. Return true if scope tree contains all the decl contexts in
-  /// the AST May modify the scope tree in order to update obsolete scopes.
-  /// Likely slow.
-  bool containsAllDeclContextsFromAST() {
-    auto allDeclContexts = findLocalizableDeclContextsInAST();
-    llvm::DenseMap<const DeclContext *, const ASTScopeImpl *> bogusDCs;
-    sourceFileScope->preOrderDo([&](ASTScopeImpl *scope) {
-      scope->expandAndBeCurrentDetectingRecursion(*this);
-    });
-    sourceFileScope->postOrderDo([&](ASTScopeImpl *scope) {
-      if (auto *dc = scope->getDeclContext().getPtrOrNull()) {
-        auto iter = allDeclContexts.find(dc);
-        if (iter != allDeclContexts.end())
-          ++iter->second;
-        else
-          bogusDCs.insert({dc, scope});
-      }
-    });
-
-    auto printDecl = [&](const Decl *d) {
-      llvm::errs() << "\ngetAsDecl() -> " << d << " ";
-      d->getSourceRange().print(llvm::errs(), ctx.SourceMgr);
-      llvm::errs() << " : ";
-      d->dump(llvm::errs());
-      llvm::errs() << "\n";
-    };
-    bool foundOmission = false;
-    for (const auto &p : allDeclContexts) {
-      if (p.second == 0) {
-        if (auto *d = p.first->getAsDecl()) {
-          if (isLocalizable(d)) {
-            llvm::errs() << "\nASTScope tree omitted DeclContext: " << p.first
-                         << " "
-                         << ":\n";
-            p.first->printContext(llvm::errs());
-            printDecl(d);
-            foundOmission = true;
-          }
-        } else {
-          // If no decl, no source range, so no scope
-        }
-      }
-    }
-    for (const auto &dcAndScope : bogusDCs) {
-      llvm::errs() << "ASTScope tree confabulated: " << dcAndScope.getFirst()
-                   << ":\n";
-      dcAndScope.getFirst()->printContext(llvm::errs());
-      if (auto *d = dcAndScope.getFirst()->getAsDecl())
-        printDecl(d);
-      dcAndScope.getSecond()->print(llvm::errs(), 0, false);
-    }
-    return !foundOmission && bogusDCs.empty();
-  }
-
-private:
-  /// Return a map of every DeclContext in the AST, and zero in the 2nd element.
-  /// For debugging.
-  llvm::DenseMap<const DeclContext *, unsigned>
-  findLocalizableDeclContextsInAST() const;
-
 public:
   SWIFT_DEBUG_DUMP { print(llvm::errs()); }
 
@@ -1535,75 +1474,6 @@ IterableTypeBodyPortion::insertionPointForDeferredExpansion(
 
 #pragma mark verification
 
-namespace {
-class LocalizableDeclContextCollector : public ASTWalker {
-
-public:
-  llvm::DenseMap<const DeclContext *, unsigned> declContexts;
-
-  void record(const DeclContext *dc) {
-    if (dc)
-      declContexts.insert({dc, 0});
-  }
-
-  bool walkToDeclPre(Decl *D) override {
-    //    catchForDebugging(D, "DictionaryBridging.swift", 694);
-    if (const auto *dc = dyn_cast<DeclContext>(D))
-      record(dc);
-    if (isa<IfConfigDecl>(D))
-      return false;
-    if (auto *pd = dyn_cast<ParamDecl>(D))
-      record(pd->getDefaultArgumentInitContext());
-    else if (auto *pbd = dyn_cast<PatternBindingDecl>(D))
-      recordInitializers(pbd);
-    else if (auto *vd = dyn_cast<VarDecl>(D)) {
-      vd->visitParsedAccessors([&](AccessorDecl *ad) {
-        ad->walk(*this);
-      });
-    }
-    return ASTWalker::walkToDeclPre(D);
-  }
-
-  std::pair<bool, Expr *> walkToExprPre(Expr *E) override {
-    if (const auto *ce = dyn_cast<ClosureExpr>(E))
-      record(ce);
-    return ASTWalker::walkToExprPre(E);
-  }
-
-private:
-  void recordInitializers(PatternBindingDecl *pbd) {
-    for (auto idx : range(pbd->getNumPatternEntries()))
-      record(pbd->getInitContext(idx));
-  }
-
-  void catchForDebugging(Decl *D, const char *file, const unsigned line) {
-    auto &SM = D->getASTContext().SourceMgr;
-    auto loc = D->getStartLoc();
-    if (!loc.isValid())
-      return;
-    auto bufID = SM.findBufferContainingLoc(loc);
-    auto f = SM.getIdentifierForBuffer(bufID);
-    auto lin = SM.getLineAndColumnInBuffer(loc).first;
-    if (f.endswith(file) && lin == line)
-      if (isa<PatternBindingDecl>(D))
-        llvm::errs() << "*** catchForDebugging: " << lin << " ***\n";
-  }
-};
-} // end namespace
-
-llvm::DenseMap<const DeclContext *, unsigned>
-ScopeCreator::findLocalizableDeclContextsInAST() const {
-  LocalizableDeclContextCollector collector;
-  sourceFileScope->SF->walk(collector);
-  // Walker omits the top
-  collector.record(sourceFileScope->SF);
-  return collector.declContexts;
-}
-
-bool ASTSourceFileScope::crossCheckWithAST() {
-  return scopeCreator->containsAllDeclContextsFromAST();
-}
-
 void ast_scope::simple_display(llvm::raw_ostream &out,
                                const ScopeCreator *scopeCreator) {
   scopeCreator->print(out);