mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-22 18:54:02 +01:00
Rename ObjectMemoryBuffer to SmallVectorMemoryBuffer; NFCI
Summary: As discussed in https://reviews.llvm.org/D45606, it makes more sense to name the class as SmallVectorMemoryBuffer Reviewers: bkramer, dblaikie Reviewed By: dblaikie Subscribers: mehdi_amini, eraman, llvm-commits Differential Revision: https://reviews.llvm.org/D45661 llvm-svn: 330107
This commit is contained in:
parent
17aab021be
commit
c5888b6f0c
@ -22,7 +22,7 @@
|
|||||||
#include "llvm/Support/Error.h"
|
#include "llvm/Support/Error.h"
|
||||||
#include "llvm/Support/ErrorHandling.h"
|
#include "llvm/Support/ErrorHandling.h"
|
||||||
#include "llvm/Support/MemoryBuffer.h"
|
#include "llvm/Support/MemoryBuffer.h"
|
||||||
#include "llvm/Support/ObjectMemoryBuffer.h"
|
#include "llvm/Support/SmallVectorMemoryBuffer.h"
|
||||||
#include "llvm/Support/raw_ostream.h"
|
#include "llvm/Support/raw_ostream.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
#include "llvm/Target/TargetMachine.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
//===- ObjectMemoryBuffer.h - SmallVector-backed MemoryBuffrer -*- C++ -*-===//
|
//===- SmallVectorMemoryBuffer.h - SmallVector-backed MemoryBuffrer -*- C++
|
||||||
|
//-*-===//
|
||||||
//
|
//
|
||||||
// The LLVM Compiler Infrastructure
|
// The LLVM Compiler Infrastructure
|
||||||
//
|
//
|
||||||
@ -27,24 +28,25 @@ namespace llvm {
|
|||||||
/// instances. This is useful for MCJIT and Orc, where object files are streamed
|
/// instances. This is useful for MCJIT and Orc, where object files are streamed
|
||||||
/// into SmallVectors, then inspected using ObjectFile (which takes a
|
/// into SmallVectors, then inspected using ObjectFile (which takes a
|
||||||
/// MemoryBuffer).
|
/// MemoryBuffer).
|
||||||
class ObjectMemoryBuffer : public MemoryBuffer {
|
class SmallVectorMemoryBuffer : public MemoryBuffer {
|
||||||
public:
|
public:
|
||||||
|
/// \brief Construct an SmallVectorMemoryBuffer from the given SmallVector
|
||||||
/// \brief Construct an ObjectMemoryBuffer from the given SmallVector r-value.
|
/// r-value.
|
||||||
///
|
///
|
||||||
/// FIXME: It'd be nice for this to be a non-templated constructor taking a
|
/// FIXME: It'd be nice for this to be a non-templated constructor taking a
|
||||||
/// SmallVectorImpl here instead of a templated one taking a SmallVector<N>,
|
/// SmallVectorImpl here instead of a templated one taking a SmallVector<N>,
|
||||||
/// but SmallVector's move-construction/assignment currently only take
|
/// but SmallVector's move-construction/assignment currently only take
|
||||||
/// SmallVectors. If/when that is fixed we can simplify this constructor and
|
/// SmallVectors. If/when that is fixed we can simplify this constructor and
|
||||||
/// the following one.
|
/// the following one.
|
||||||
ObjectMemoryBuffer(SmallVectorImpl<char> &&SV)
|
SmallVectorMemoryBuffer(SmallVectorImpl<char> &&SV)
|
||||||
: SV(std::move(SV)), BufferName("<in-memory object>") {
|
: SV(std::move(SV)), BufferName("<in-memory object>") {
|
||||||
init(this->SV.begin(), this->SV.end(), false);
|
init(this->SV.begin(), this->SV.end(), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \brief Construct a named ObjectMemoryBuffer from the given SmallVector
|
/// \brief Construct a named SmallVectorMemoryBuffer from the given
|
||||||
|
/// SmallVector
|
||||||
/// r-value and StringRef.
|
/// r-value and StringRef.
|
||||||
ObjectMemoryBuffer(SmallVectorImpl<char> &&SV, StringRef Name)
|
SmallVectorMemoryBuffer(SmallVectorImpl<char> &&SV, StringRef Name)
|
||||||
: SV(std::move(SV)), BufferName(Name) {
|
: SV(std::move(SV)), BufferName(Name) {
|
||||||
init(this->SV.begin(), this->SV.end(), false);
|
init(this->SV.begin(), this->SV.end(), false);
|
||||||
}
|
}
|
@ -164,7 +164,7 @@ std::unique_ptr<MemoryBuffer> MCJIT::emitObject(Module *M) {
|
|||||||
// Flush the output buffer to get the generated code into memory
|
// Flush the output buffer to get the generated code into memory
|
||||||
|
|
||||||
std::unique_ptr<MemoryBuffer> CompiledObjBuffer(
|
std::unique_ptr<MemoryBuffer> CompiledObjBuffer(
|
||||||
new ObjectMemoryBuffer(std::move(ObjBufferSV)));
|
new SmallVectorMemoryBuffer(std::move(ObjBufferSV)));
|
||||||
|
|
||||||
// If we have an object cache, tell it about the new object.
|
// If we have an object cache, tell it about the new object.
|
||||||
// Note that we're using the compiled image, not the loaded image (as below).
|
// Note that we're using the compiled image, not the loaded image (as below).
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
|
#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
|
||||||
#include "llvm/ExecutionEngine/RuntimeDyld.h"
|
#include "llvm/ExecutionEngine/RuntimeDyld.h"
|
||||||
#include "llvm/IR/Module.h"
|
#include "llvm/IR/Module.h"
|
||||||
#include "llvm/Support/ObjectMemoryBuffer.h"
|
#include "llvm/Support/SmallVectorMemoryBuffer.h"
|
||||||
|
|
||||||
namespace llvm {
|
namespace llvm {
|
||||||
class MCJIT;
|
class MCJIT;
|
||||||
|
@ -36,9 +36,9 @@
|
|||||||
#include "llvm/Support/CachePruning.h"
|
#include "llvm/Support/CachePruning.h"
|
||||||
#include "llvm/Support/Debug.h"
|
#include "llvm/Support/Debug.h"
|
||||||
#include "llvm/Support/Error.h"
|
#include "llvm/Support/Error.h"
|
||||||
#include "llvm/Support/ObjectMemoryBuffer.h"
|
|
||||||
#include "llvm/Support/Path.h"
|
#include "llvm/Support/Path.h"
|
||||||
#include "llvm/Support/SHA1.h"
|
#include "llvm/Support/SHA1.h"
|
||||||
|
#include "llvm/Support/SmallVectorMemoryBuffer.h"
|
||||||
#include "llvm/Support/TargetRegistry.h"
|
#include "llvm/Support/TargetRegistry.h"
|
||||||
#include "llvm/Support/ThreadPool.h"
|
#include "llvm/Support/ThreadPool.h"
|
||||||
#include "llvm/Support/Threading.h"
|
#include "llvm/Support/Threading.h"
|
||||||
@ -274,7 +274,7 @@ std::unique_ptr<MemoryBuffer> codegenModule(Module &TheModule,
|
|||||||
// Run codegen now. resulting binary is in OutputBuffer.
|
// Run codegen now. resulting binary is in OutputBuffer.
|
||||||
PM.run(TheModule);
|
PM.run(TheModule);
|
||||||
}
|
}
|
||||||
return make_unique<ObjectMemoryBuffer>(std::move(OutputBuffer));
|
return make_unique<SmallVectorMemoryBuffer>(std::move(OutputBuffer));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Manage caching for a single Module.
|
/// Manage caching for a single Module.
|
||||||
@ -475,7 +475,7 @@ ProcessThinLTOModule(Module &TheModule, ModuleSummaryIndex &Index,
|
|||||||
auto Index = buildModuleSummaryIndex(TheModule, nullptr, &PSI);
|
auto Index = buildModuleSummaryIndex(TheModule, nullptr, &PSI);
|
||||||
WriteBitcodeToFile(TheModule, OS, true, &Index);
|
WriteBitcodeToFile(TheModule, OS, true, &Index);
|
||||||
}
|
}
|
||||||
return make_unique<ObjectMemoryBuffer>(std::move(OutputBuffer));
|
return make_unique<SmallVectorMemoryBuffer>(std::move(OutputBuffer));
|
||||||
}
|
}
|
||||||
|
|
||||||
return codegenModule(TheModule, TM);
|
return codegenModule(TheModule, TM);
|
||||||
|
@ -18,10 +18,10 @@
|
|||||||
#include "llvm/Support/Errno.h"
|
#include "llvm/Support/Errno.h"
|
||||||
#include "llvm/Support/FileSystem.h"
|
#include "llvm/Support/FileSystem.h"
|
||||||
#include "llvm/Support/MathExtras.h"
|
#include "llvm/Support/MathExtras.h"
|
||||||
#include "llvm/Support/ObjectMemoryBuffer.h"
|
|
||||||
#include "llvm/Support/Path.h"
|
#include "llvm/Support/Path.h"
|
||||||
#include "llvm/Support/Process.h"
|
#include "llvm/Support/Process.h"
|
||||||
#include "llvm/Support/Program.h"
|
#include "llvm/Support/Program.h"
|
||||||
|
#include "llvm/Support/SmallVectorMemoryBuffer.h"
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
@ -534,4 +534,4 @@ MemoryBufferRef MemoryBuffer::getMemBufferRef() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MemoryBuffer::anchor() {}
|
void MemoryBuffer::anchor() {}
|
||||||
void ObjectMemoryBuffer::anchor() {}
|
void SmallVectorMemoryBuffer::anchor() {}
|
||||||
|
Loading…
Reference in New Issue
Block a user