mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-05 13:26:55 +00:00
Return a std::unique_ptr when creating a new MemoryBuffer.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216583 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -51,8 +51,8 @@ static std::unique_ptr<Module> getLazyModuleFromAssembly(LLVMContext &Context,
|
||||
SmallString<1024> &Mem,
|
||||
const char *Assembly) {
|
||||
writeModuleToBuffer(parseAssembly(Assembly), Mem);
|
||||
std::unique_ptr<MemoryBuffer> Buffer(
|
||||
MemoryBuffer::getMemBuffer(Mem.str(), "test", false));
|
||||
std::unique_ptr<MemoryBuffer> Buffer =
|
||||
MemoryBuffer::getMemBuffer(Mem.str(), "test", false);
|
||||
ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(Buffer, Context);
|
||||
return std::unique_ptr<Module>(ModuleOrErr.get());
|
||||
}
|
||||
|
@@ -632,9 +632,9 @@ std::string AssembleToBitcode(LLVMContext &Context, const char *Assembly) {
|
||||
ExecutionEngine *getJITFromBitcode(
|
||||
LLVMContext &Context, const std::string &Bitcode, Module *&M) {
|
||||
// c_str() is null-terminated like MemoryBuffer::getMemBuffer requires.
|
||||
std::unique_ptr<MemoryBuffer> BitcodeBuffer(
|
||||
MemoryBuffer::getMemBuffer(Bitcode, "Bitcode for test"));
|
||||
ErrorOr<Module*> ModuleOrErr = getLazyBitcodeModule(BitcodeBuffer, Context);
|
||||
std::unique_ptr<MemoryBuffer> BitcodeBuffer =
|
||||
MemoryBuffer::getMemBuffer(Bitcode, "Bitcode for test");
|
||||
ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(BitcodeBuffer, Context);
|
||||
if (std::error_code EC = ModuleOrErr.getError()) {
|
||||
ADD_FAILURE() << EC.message();
|
||||
return nullptr;
|
||||
|
@@ -41,8 +41,7 @@ public:
|
||||
return nullptr;
|
||||
// Our test cache wants to maintain ownership of its object buffers
|
||||
// so we make a copy here for the execution engine.
|
||||
return std::unique_ptr<MemoryBuffer>(
|
||||
MemoryBuffer::getMemBufferCopy(BufferFound->getBuffer()));
|
||||
return MemoryBuffer::getMemBufferCopy(BufferFound->getBuffer());
|
||||
}
|
||||
|
||||
// Test-harness-specific functions
|
||||
@@ -65,8 +64,8 @@ public:
|
||||
private:
|
||||
MemoryBuffer *copyBuffer(MemoryBufferRef Buf) {
|
||||
// Create a local copy of the buffer.
|
||||
std::unique_ptr<MemoryBuffer> NewBuffer(
|
||||
MemoryBuffer::getMemBufferCopy(Buf.getBuffer()));
|
||||
std::unique_ptr<MemoryBuffer> NewBuffer =
|
||||
MemoryBuffer::getMemBufferCopy(Buf.getBuffer());
|
||||
MemoryBuffer *Ret = NewBuffer.get();
|
||||
AllocatedBuffers.push_back(std::move(NewBuffer));
|
||||
return Ret;
|
||||
|
@@ -95,19 +95,19 @@ TEST(LineIteratorTest, EmptyBuffers) {
|
||||
EXPECT_TRUE(line_iterator(*Buffer).is_at_eof());
|
||||
EXPECT_EQ(line_iterator(), line_iterator(*Buffer));
|
||||
|
||||
Buffer.reset(MemoryBuffer::getMemBuffer("\n\n\n"));
|
||||
Buffer = MemoryBuffer::getMemBuffer("\n\n\n");
|
||||
EXPECT_TRUE(line_iterator(*Buffer).is_at_eof());
|
||||
EXPECT_EQ(line_iterator(), line_iterator(*Buffer));
|
||||
|
||||
Buffer.reset(MemoryBuffer::getMemBuffer("# foo\n"
|
||||
"\n"
|
||||
"# bar"));
|
||||
Buffer = MemoryBuffer::getMemBuffer("# foo\n"
|
||||
"\n"
|
||||
"# bar");
|
||||
EXPECT_TRUE(line_iterator(*Buffer, '#').is_at_eof());
|
||||
EXPECT_EQ(line_iterator(), line_iterator(*Buffer, '#'));
|
||||
|
||||
Buffer.reset(MemoryBuffer::getMemBuffer("\n"
|
||||
"# baz\n"
|
||||
"\n"));
|
||||
Buffer = MemoryBuffer::getMemBuffer("\n"
|
||||
"# baz\n"
|
||||
"\n");
|
||||
EXPECT_TRUE(line_iterator(*Buffer, '#').is_at_eof());
|
||||
EXPECT_EQ(line_iterator(), line_iterator(*Buffer, '#'));
|
||||
}
|
||||
|
@@ -23,8 +23,8 @@ public:
|
||||
std::string Output;
|
||||
|
||||
void setMainBuffer(StringRef Text, StringRef BufferName) {
|
||||
std::unique_ptr<MemoryBuffer> MainBuffer(
|
||||
MemoryBuffer::getMemBuffer(Text, BufferName));
|
||||
std::unique_ptr<MemoryBuffer> MainBuffer =
|
||||
MemoryBuffer::getMemBuffer(Text, BufferName);
|
||||
MainBufferID = SM.AddNewSourceBuffer(std::move(MainBuffer), llvm::SMLoc());
|
||||
}
|
||||
|
||||
|
@@ -210,8 +210,8 @@ TEST(YAMLParser, DiagnosticFilenameFromBufferID) {
|
||||
|
||||
// When we construct a YAML stream over a named buffer,
|
||||
// we get its ID as filename in diagnostics.
|
||||
std::unique_ptr<MemoryBuffer> Buffer(
|
||||
MemoryBuffer::getMemBuffer("[]", "buffername.yaml"));
|
||||
std::unique_ptr<MemoryBuffer> Buffer =
|
||||
MemoryBuffer::getMemBuffer("[]", "buffername.yaml");
|
||||
yaml::Stream Stream(Buffer->getMemBufferRef(), SM);
|
||||
Stream.printError(Stream.begin()->getRoot(), "Hello, World!");
|
||||
EXPECT_EQ("buffername.yaml", GeneratedDiag.getFilename());
|
||||
|
Reference in New Issue
Block a user