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

SourceManager: make findBufferContainingLoc() always succeed.

Browse Source 
Every valid source location corresponds to a source buffer.  There should be no
cases where we create a source location for a random string.  Thus,
findBufferContainingLoc() always succeeds.


Swift SVN r7120
This commit is contained in:
Dmitri Hrybenko
2013-08-10 01:48:04 +00:00
parent 09837a1b88
commit 13070a31bd
8 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/swift/Basic/SourceManager.h
View File

@@ -90,8 +90,15 @@ public:
rangeContainsTokenLoc(Enclosing, Inner.End);
}
int findBufferContainingLoc(SourceLoc Loc) const {
return LLVMSourceMgr.FindBufferContainingLoc(Loc.Value);
/// Returns the buffer ID for the specified *valid* location.
///
/// Because a valid source location always corresponds to a source buffer,
/// this routine always returns a valid buffer ID.
unsigned findBufferContainingLoc(SourceLoc Loc) const {
assert(Loc.isValid());
int BufferID = LLVMSourceMgr.FindBufferContainingLoc(Loc.Value);
assert(BufferID != -1);
return unsigned(BufferID);
}
size_t addNewSourceBuffer(llvm::MemoryBuffer *Buffer, SourceLoc IncludeLoc) {
@@ -112,6 +119,7 @@ public:
std::pair<unsigned, unsigned> getLineAndColumn(SourceLoc Loc,
int BufferID = -1) const {
assert(Loc.isValid());
return LLVMSourceMgr.getLineAndColumn(Loc.Value, BufferID);
}
};