6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 22:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Refactor some parser interfaces to fix PR3278 and a FIXME:

Browse Source 
ParseAssemblyString with a specified module would not parse
into the module, it would create and return a new one.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61635 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-01-04 20:44:11 +00:00
parent 0f8df9a9ce
commit ad7d1e2085
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/AsmParser/Parser.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/Assembly/Parser.h"
#include "LLParser.h"
#include "llvm/Module.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
#include <cstring>
@ -23,28 +24,36 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
Err.setFilename(Filename);
std::string ErrorStr;
MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
OwningPtr<MemoryBuffer>
F(MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr));
if (F == 0) {
Err.setError("Could not open input file '" + Filename + "'");
return 0;
}
Module *Result = LLParser(F, Err).Run();
delete F;
return Result;
OwningPtr<Module> M(new Module(Filename));
if (LLParser(F.get(), Err, M.get()).Run())
return 0;
return M.take();
}
// FIXME: M is ignored??
Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
ParseError &Err) {
Err.setFilename("<string>");
MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString,
AsmString+strlen(AsmString),
"<string>");
Module *Result = LLParser(F, Err).Run();
delete F;
return Result;
OwningPtr<MemoryBuffer>
F(MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
"<string>"));
// If we are parsing into an existing module, do it.
if (M)
return LLParser(F.get(), Err, M).Run() ? 0 : M;
// Otherwise create a new module.
OwningPtr<Module> M2(new Module("<string>"));
if (LLParser(F.get(), Err, M2.get()).Run())
return 0;
return M2.take();
}