averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bob Wilson
2016-10-17 11:52:21 -07:00
parent fd5e69f18a 781ee82cf6
commit 1caba3e209
222 changed files with 4965 additions and 4290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Basic/SourceLoc.cpp
View File

@@ -82,7 +82,7 @@ bool SourceManager::openVirtualFile(SourceLoc loc, StringRef name,
CharSourceRange range = CharSourceRange(*this, loc, end);
VirtualFiles[end.Value.getPointer()] = { range, name, lineOffset };
CachedVFile = {};
CachedVFile = {nullptr, nullptr};
return true;
}
@@ -99,7 +99,7 @@ void SourceManager::closeVirtualFile(SourceLoc end) {
#endif
return;
}
CachedVFile = {};
CachedVFile = {nullptr, nullptr};
CharSourceRange oldRange = virtualFile->Range;
virtualFile->Range = CharSourceRange(*this, virtualFile->Range.getStart(),