6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-31 09:25:42 +00:00
Code Issues Projects Releases Wiki Activity

MemoryBuffer now return an error_code and returns a OwningPtr<MemoryBuffer> via an out parm.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121958 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer
2010-12-16 03:29:14 +00:00
parent b29b20e7de
commit 3ff9563c3e
24 changed files with 161 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Support/SourceMgr.cpp
View File

@@ -16,6 +16,7 @@
#include "llvm/ADT/Twine.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
using namespace llvm;
@@ -49,18 +50,18 @@ SourceMgr::~SourceMgr() {
/// ~0, otherwise it returns the buffer ID of the stacked file.
unsigned SourceMgr::AddIncludeFile(const std::string &Filename,
SMLoc IncludeLoc) {
error_code ec;
MemoryBuffer *NewBuf = MemoryBuffer::getFile(Filename.c_str(), ec);
OwningPtr<MemoryBuffer> NewBuf;
MemoryBuffer::getFile(Filename.c_str(), NewBuf);
// If the file didn't exist directly, see if it's in an include path.
for (unsigned i = 0, e = IncludeDirectories.size(); i != e && !NewBuf; ++i) {
std::string IncFile = IncludeDirectories[i] + "/" + Filename;
NewBuf = MemoryBuffer::getFile(IncFile.c_str(), ec);
MemoryBuffer::getFile(IncFile.c_str(), NewBuf);
}
if (NewBuf == 0) return ~0U;
return AddNewSourceBuffer(NewBuf, IncludeLoc);
return AddNewSourceBuffer(NewBuf.take(), IncludeLoc);
}