6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-05 14:34:55 +00:00
Code Issues Projects Releases Wiki Activity

For PR797:

Browse Source 
Adjust users of MappedFile to its new non-throwing interface.  Note that in
most cases the lazy step of just throwing after a call to MappedFile was
installed. This was done in the name of incremental changes. Getting rid of
the new throw statements will take adjustment of interfaces and propagation
of errors to higher levels.  Those changes will come in subsequent patches.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29817 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-08-22 16:06:27 +00:00
parent 6d045fcdcd
commit 8627969597
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Debugger/SourceFile.h
View File

@ -50,7 +50,10 @@ namespace llvm {
/// reading it, or if the user cancels the operation. Instead, it will just
/// be an empty source file.
SourceFile(const std::string &fn, const GlobalVariable *Desc)
: Filename(fn), Descriptor(Desc), File(Filename) {
: Filename(fn), Descriptor(Desc), File() {
std::string ErrMsg;
if (File.open(Filename, sys::MappedFile::READ_ACCESS, &ErrMsg))
throw ErrMsg;
readFile();
}
~SourceFile() {

4
lib/Debugger/SourceFile.cpp
View File

@ -19,7 +19,9 @@ using namespace llvm;
/// readFile - Load Filename
///
void SourceFile::readFile() {
File.map();
std::string ErrMsg;
if (File.map(&ErrMsg))
throw ErrMsg;
}
/// calculateLineOffsets - Compute the LineOffset vector for the current file.

20
lib/Support/FileUtilities.cpp
View File

@ -147,9 +147,11 @@ int llvm::DiffFilesWithTolerance(const sys::Path &FileA,
double AbsTol, double RelTol,
std::string *Error) {
sys::FileStatus FileAStat, FileBStat;
if (FileA.getFileStatus(FileAStat, Error) ||
FileB.getFileStatus(FileBStat, Error))
if (FileA.getFileStatus(FileAStat, Error))
return 2;
if (FileB.getFileStatus(FileBStat, Error))
return 2;
// Check for zero length files because some systems croak when you try to
// mmap an empty file.
size_t A_size = FileAStat.getSize();
@ -165,10 +167,16 @@ int llvm::DiffFilesWithTolerance(const sys::Path &FileA,
try {
// Now its safe to mmap the files into memory becasue both files
// have a non-zero size.
sys::MappedFile F1(FileA);
sys::MappedFile F2(FileB);
F1.map();
F2.map();
sys::MappedFile F1;
if (F1.open(FileA, sys::MappedFile::READ_ACCESS, Error))
return 2;
sys::MappedFile F2;
if (F2.open(FileB, sys::MappedFile::READ_ACCESS, Error))
return 2;
if (!F1.map(Error))
return 2;
if (!F2.map(Error))
return 2;
// Okay, now that we opened the files, scan them for the first difference.
char *File1Start = F1.charBase();