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

This commit is contained in:
swift-ci
2018-07-19 10:49:42 -07:00
8 changed files with 23 additions and 23 deletions

View File

@@ -477,7 +477,7 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
SourceFile *SF) {
// We always expect the EOF token to be reparsed. Don't complain about it.
auto Eof = SF->getSyntaxRoot().getChild(SourceFileSyntax::Cursor::EOFToken);
auto EofNodeStart = Eof->getAbsolutePositionWithLeadingTrivia().getOffset();
auto EofNodeStart = Eof->getAbsolutePositionBeforeLeadingTrivia().getOffset();
if (ExpectedReparseRegions.Ranges.back().End >= EofNodeStart) {
// If the last expected reparse region already covers part of the eof
// leading trivia, extended it