Merge commit 'bbc257cf3bf6' from apple/stable/20210107 into swift/main

Author: git apple-llvm automerger

clang/lib/Tooling/Refactor/ASTSlice.cpp

@@ -261,7 +261,7 @@ canonicalizeSelectedExpr(const Stmt *S, unsigned Index,
 
   // Look through the implicit casts in the parents.
   unsigned ParentIndex = Index + 1;
-  for (; ParentIndex <= NodeTree.size() && isa<ImplicitCastExpr>(Parent);
+  for (; (ParentIndex + 1) < NodeTree.size() && isa<ImplicitCastExpr>(Parent);
        ++ParentIndex) {
     const Stmt *NewParent = NodeTree[ParentIndex + 1].getStmtOrNull();
     if (!NewParent)