Merge pull request #5686 from nkcsgexi/range-info-assertion

Author: swift-ci

lib/IDE/SwiftSourceDocInfo.cpp

@@ -217,10 +217,12 @@ struct RangeResolver::Implementation {
 public:
   Implementation(SourceFile &File, SourceLoc Start, SourceLoc End) :
     File(File), Start(Start), End(End), Content(getContent()) {}
-  ~Implementation() { assert(ContextStack.empty()); }
   bool hasResult() { return Result.hasValue(); }
   void enter(ASTNode Node) { ContextStack.emplace_back(Node); }
-  void leave() { ContextStack.pop_back(); }
+  void leave(ASTNode Node) {
+    assert(ContextStack.back().Parent.getOpaqueValue() == Node.getOpaqueValue());
+    ContextStack.pop_back();
+  }
 
   void analyze(ASTNode Node) {
     auto &DCInfo = getCurrentDC();
@@ -245,6 +247,8 @@ struct RangeResolver::Implementation {
 
   bool shouldEnter(ASTNode Node) {
     SourceManager &SM = File.getASTContext().SourceMgr;
+    if (hasResult())
+      return false;
     if (SM.isBeforeInBuffer(End, Node.getSourceRange().Start))
       return false;
     if (SM.isBeforeInBuffer(Node.getSourceRange().End, Start))
@@ -288,44 +292,43 @@ bool RangeResolver::walkToExprPre(Expr *E) {
     return false;
   Impl.analyze(E);
   Impl.enter(E);
-  return !Impl.hasResult();
+  return true;
 }
 
 bool RangeResolver::walkToStmtPre(Stmt *S) {
   if (!Impl.shouldEnter(S))
     return false;
   Impl.analyze(S);
   Impl.enter(S);
-  return !Impl.hasResult();
+  return true;
 };
 
 bool RangeResolver::walkToDeclPre(Decl *D, CharSourceRange Range) {
   if (!Impl.shouldEnter(D))
     return false;
   Impl.analyze(D);
   Impl.enter(D);
-  return !Impl.hasResult();
+  return true;
 }
 
 bool RangeResolver::walkToExprPost(Expr *E) {
-  Impl.leave();
+  Impl.leave(E);
   return !Impl.hasResult();
 }
 
 bool RangeResolver::walkToStmtPost(Stmt *S) {
-  Impl.leave();
+  Impl.leave(S);
   return !Impl.hasResult();
 };
 
 bool RangeResolver::walkToDeclPost(Decl *D) {
-  Impl.leave();
+  Impl.leave(D);
   return !Impl.hasResult();
 }
 
 ResolvedRangeInfo RangeResolver::resolve() {
   Impl.enter(ASTNode());
   walk(Impl.File);
-  Impl.leave();
   return Impl.getResult();
 }