Added debugging helpers for range-matching

Author: David Ungar

include/swift/AST/ASTScope.h

@@ -215,6 +215,10 @@ class ASTScopeImpl {
 
   bool checkSourceRangeOfThisASTNode() const;
 
+  /// For debugging
+  bool doesRangeMatch(unsigned start, unsigned end, StringRef file = "",
+                      StringRef className = "");
+
 private:
   SourceRange computeSourceRangeOfScope(bool omitAssertions = false) const;
   SourceRange

lib/AST/ASTScopeCreation.cpp

@@ -93,6 +93,26 @@ static void dumpRangeable(SpecializeAttr *r, llvm::raw_ostream &f) {
   llvm::errs() << "SpecializeAttr\n";
 }
 
+/// For Debugging
+template <typename T>
+bool doesRangeableRangeMatch(const T *x, const SourceManager &SM,
+                             unsigned start, unsigned end,
+                             StringRef file = "") {
+  auto const r = getRangeableSourceRange(x);
+  if (r.isInvalid())
+    return false;
+  if (start && SM.getLineNumber(r.Start) != start)
+    return false;
+  if (end && SM.getLineNumber(r.End) != end)
+    return false;
+  if (file.empty())
+    return true;
+  const auto buf = SM.findBufferContainingLoc(r.Start);
+  return SM.getIdentifierForBuffer(buf).endswith(file);
+}
+
+#pragma mark end of rangeable
+
 static std::vector<ASTNode> asNodeVector(DeclRange dr) {
   std::vector<ASTNode> nodes;
   llvm::transform(dr, std::back_inserter(nodes),
@@ -366,7 +386,7 @@ class ScopeCreator final {
             parent, vd);
     });
   }
-  // HERE
+
 public:
   /// Create the matryoshka nested generic param scopes (if any)
   /// that are subscopes of the receiver. Return

lib/AST/ASTScopeSourceRange.cpp

@@ -166,6 +166,22 @@ NullablePtr<ASTScopeImpl> ASTScopeImpl::getPriorSibling() const {
   return siblingsAndMe[myIndex - 1];
 }
 
+bool ASTScopeImpl::doesRangeMatch(unsigned start, unsigned end, StringRef file,
+                                  StringRef className) {
+  if (!className.empty() && className != getClassName())
+    return false;
+  const auto &SM = getSourceManager();
+  const auto r = getSourceRangeOfScope(true);
+  if (start && start != SM.getLineNumber(r.Start))
+    return false;
+  if (end && end != SM.getLineNumber(r.End))
+    return false;
+  if (file.empty())
+    return true;
+  const auto buf = SM.findBufferContainingLoc(r.Start);
+  return SM.getIdentifierForBuffer(buf).endswith(file);
+}
+
 #pragma mark getSourceRangeOfThisASTNode
 
 SourceRange SpecializeAttributeScope::getSourceRangeOfThisASTNode(