mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-26 05:32:25 +00:00
keep only the StringRef version of getFileOrSTDIN.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184826 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
fa34f42fd6
commit
dd5af27a74
@ -119,11 +119,7 @@ public:
|
||||
static error_code getFileOrSTDIN(StringRef Filename,
|
||||
OwningPtr<MemoryBuffer> &result,
|
||||
int64_t FileSize = -1);
|
||||
static error_code getFileOrSTDIN(const char *Filename,
|
||||
OwningPtr<MemoryBuffer> &result,
|
||||
int64_t FileSize = -1);
|
||||
|
||||
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
// Provided for performance analysis.
|
||||
//===--------------------------------------------------------------------===//
|
||||
|
@ -43,7 +43,7 @@ Module *llvm::ParseAssembly(MemoryBuffer *F,
|
||||
Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
|
||||
LLVMContext &Context) {
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, File)) {
|
||||
Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
|
||||
"Could not open input file: " + ec.message());
|
||||
return 0;
|
||||
|
@ -48,7 +48,7 @@ Module *llvm::getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err,
|
||||
Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err,
|
||||
LLVMContext &Context) {
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, File)) {
|
||||
Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
|
||||
"Could not open input file: " + ec.message());
|
||||
return 0;
|
||||
@ -79,7 +79,7 @@ Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err,
|
||||
Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err,
|
||||
LLVMContext &Context) {
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, File)) {
|
||||
Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
|
||||
"Could not open input file: " + ec.message());
|
||||
return 0;
|
||||
|
@ -173,14 +173,6 @@ error_code MemoryBuffer::getFileOrSTDIN(StringRef Filename,
|
||||
return getFile(Filename, result, FileSize);
|
||||
}
|
||||
|
||||
error_code MemoryBuffer::getFileOrSTDIN(const char *Filename,
|
||||
OwningPtr<MemoryBuffer> &result,
|
||||
int64_t FileSize) {
|
||||
if (strcmp(Filename, "-") == 0)
|
||||
return getSTDIN(result);
|
||||
return getFile(Filename, result, FileSize);
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
// MemoryBuffer::getFile implementation.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
@ -83,7 +83,7 @@ int TableGenMain(char *argv0, TableGenMainFn *MainFn) {
|
||||
// Parse the input file.
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec =
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), File)) {
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename, File)) {
|
||||
errs() << "Could not open input file '" << InputFilename << "': "
|
||||
<< ec.message() <<"\n";
|
||||
return 1;
|
||||
|
@ -481,7 +481,7 @@ static int AnalyzeBitcode() {
|
||||
OwningPtr<MemoryBuffer> MemBuf;
|
||||
|
||||
if (error_code ec =
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), MemBuf))
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename, MemBuf))
|
||||
return Error("Error reading '" + InputFilename + "': " + ec.message());
|
||||
|
||||
if (MemBuf->getBufferSize() & 3)
|
||||
|
@ -295,7 +295,7 @@ static void DisassembleInputMachO2(StringRef Filename,
|
||||
// get the sections and supply it to the section name parsing machinery.
|
||||
if (!DSYMFile.empty()) {
|
||||
OwningPtr<MemoryBuffer> Buf;
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(DSYMFile.c_str(), Buf)) {
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(DSYMFile, Buf)) {
|
||||
errs() << "llvm-objdump: " << Filename << ": " << ec.message() << '\n';
|
||||
return;
|
||||
}
|
||||
|
@ -667,7 +667,7 @@ static bool ReadCheckFile(SourceMgr &SM,
|
||||
std::vector<CheckString> &CheckStrings) {
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec =
|
||||
MemoryBuffer::getFileOrSTDIN(CheckFilename.c_str(), File)) {
|
||||
MemoryBuffer::getFileOrSTDIN(CheckFilename, File)) {
|
||||
errs() << "Could not open check file '" << CheckFilename << "': "
|
||||
<< ec.message() << '\n';
|
||||
return true;
|
||||
@ -1015,7 +1015,7 @@ int main(int argc, char **argv) {
|
||||
// Open the file to check and add it to SourceMgr.
|
||||
OwningPtr<MemoryBuffer> File;
|
||||
if (error_code ec =
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), File)) {
|
||||
MemoryBuffer::getFileOrSTDIN(InputFilename, File)) {
|
||||
errs() << "Could not open input file '" << InputFilename << "': "
|
||||
<< ec.message() << '\n';
|
||||
return 2;
|
||||
|
@ -45,7 +45,7 @@ int main(int argc, char **argv) {
|
||||
|
||||
// Get the input data.
|
||||
OwningPtr<MemoryBuffer> In;
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), In)) {
|
||||
if (error_code ec = MemoryBuffer::getFileOrSTDIN(InputFilename, In)) {
|
||||
errs() << argv[0] << ": error: Unable to get input '"
|
||||
<< InputFilename << "': " << ec.message() << '\n';
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user