of requiring a name be passed in. This makes it use "<stdin>"
instead of "-" and makes it more consistent with the Bitcode reader.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81256
91177308-0d34-0410-b5e6-
96231b3b80d8
/// takes ownership of the MemoryBuffer.
Module *ParseAssembly(
MemoryBuffer *F, ///< The MemoryBuffer containing assembly
/// takes ownership of the MemoryBuffer.
Module *ParseAssembly(
MemoryBuffer *F, ///< The MemoryBuffer containing assembly
- const std::string &Name, ///< The name of the original source file
Module *M, ///< A module to add the assembly too.
SMDiagnostic &Err, ///< Error result info.
LLVMContext &Context
Module *M, ///< A module to add the assembly too.
SMDiagnostic &Err, ///< Error result info.
LLVMContext &Context
/// ModuleProvider. This function *always* takes ownership of the given
/// MemoryBuffer.
inline ModuleProvider *getIRModuleProvider(MemoryBuffer *Buffer,
/// ModuleProvider. This function *always* takes ownership of the given
/// MemoryBuffer.
inline ModuleProvider *getIRModuleProvider(MemoryBuffer *Buffer,
- const std::string &Filename,
SMDiagnostic &Err,
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
SMDiagnostic &Err,
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
std::string ErrMsg;
ModuleProvider *MP = getBitcodeModuleProvider(Buffer, Context, &ErrMsg);
if (MP == 0) {
std::string ErrMsg;
ModuleProvider *MP = getBitcodeModuleProvider(Buffer, Context, &ErrMsg);
if (MP == 0) {
- Err = SMDiagnostic(Filename, -1, -1, ErrMsg, "");
+ Err = SMDiagnostic(Buffer->getBufferIdentifier(), -1, -1, ErrMsg, "");
// ParseBitcodeFile does not take ownership of the Buffer in the
// case of an error.
delete Buffer;
// ParseBitcodeFile does not take ownership of the Buffer in the
// case of an error.
delete Buffer;
- Module *M = ParseAssembly(Buffer, Filename, 0, Err, Context);
+ Module *M = ParseAssembly(Buffer, 0, Err, Context);
if (M == 0)
return 0;
return new ExistingModuleProvider(M);
if (M == 0)
return 0;
return new ExistingModuleProvider(M);
- return getIRModuleProvider(F, Filename, Err, Context);
+ return getIRModuleProvider(F, Err, Context);
}
/// If the given MemoryBuffer holds a bitcode image, return a Module
}
/// If the given MemoryBuffer holds a bitcode image, return a Module
/// a Module for it. This function *always* takes ownership of the given
/// MemoryBuffer.
inline Module *ParseIR(MemoryBuffer *Buffer,
/// a Module for it. This function *always* takes ownership of the given
/// MemoryBuffer.
inline Module *ParseIR(MemoryBuffer *Buffer,
- const std::string &Filename,
SMDiagnostic &Err,
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
SMDiagnostic &Err,
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
// ParseBitcodeFile does not take ownership of the Buffer.
delete Buffer;
if (M == 0)
// ParseBitcodeFile does not take ownership of the Buffer.
delete Buffer;
if (M == 0)
- Err = SMDiagnostic(Filename, -1, -1, ErrMsg, "");
+ Err = SMDiagnostic(Buffer->getBufferIdentifier(), -1, -1, ErrMsg, "");
- return ParseAssembly(Buffer, Filename, 0, Err, Context);
+ return ParseAssembly(Buffer, 0, Err, Context);
}
/// If the given file holds a bitcode image, return a Module for it.
}
/// If the given file holds a bitcode image, return a Module for it.
- return ParseIR(F, Filename, Err, Context);
+ return ParseIR(F, Err, Context);
using namespace llvm;
Module *llvm::ParseAssembly(MemoryBuffer *F,
using namespace llvm;
Module *llvm::ParseAssembly(MemoryBuffer *F,
- const std::string &Name,
Module *M,
SMDiagnostic &Err,
LLVMContext &Context) {
Module *M,
SMDiagnostic &Err,
LLVMContext &Context) {
return LLParser(F, SM, Err, M).Run() ? 0 : M;
// Otherwise create a new module.
return LLParser(F, SM, Err, M).Run() ? 0 : M;
// Otherwise create a new module.
- OwningPtr<Module> M2(new Module(Name, Context));
+ OwningPtr<Module> M2(new Module(F->getBufferIdentifier(), Context));
if (LLParser(F, SM, Err, M2.get()).Run())
return 0;
return M2.take();
if (LLParser(F, SM, Err, M2.get()).Run())
return 0;
return M2.take();
- return ParseAssembly(F, Filename, 0, Err, Context);
+ return ParseAssembly(F, 0, Err, Context);
}
Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
}
Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
"<string>");
MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
"<string>");
- return ParseAssembly(F, "<string>", M, Err, Context);
+ return ParseAssembly(F, M, Err, Context);