Skip to content

Commit 6823222

Browse files
committed
NFC: Move ObjectMemoryBuffer to support
Summary: Since the class is used by both MCJIT and LTO, it makes more sense to move it to Support lib. This is a follow up patch to r329929 and https://reviews.llvm.org/D45244 Reviewers: bkramer, dblaikie Reviewed By: bkramer Subscribers: mehdi_amini, eraman, llvm-commits Differential Revision: https://reviews.llvm.org/D45606 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@330093 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 0c191c5 commit 6823222

File tree

6 files changed

+6
-4
lines changed

6 files changed

+6
-4
lines changed

include/llvm/ExecutionEngine/Orc/CompileUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
#include "llvm/ADT/SmallVector.h"
1818
#include "llvm/ExecutionEngine/ObjectCache.h"
19-
#include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
2019
#include "llvm/IR/LegacyPassManager.h"
2120
#include "llvm/Object/Binary.h"
2221
#include "llvm/Object/ObjectFile.h"
2322
#include "llvm/Support/Error.h"
2423
#include "llvm/Support/ErrorHandling.h"
2524
#include "llvm/Support/MemoryBuffer.h"
25+
#include "llvm/Support/ObjectMemoryBuffer.h"
2626
#include "llvm/Support/raw_ostream.h"
2727
#include "llvm/Target/TargetMachine.h"
2828
#include <algorithm>

include/llvm/ExecutionEngine/ObjectMemoryBuffer.h renamed to include/llvm/Support/ObjectMemoryBuffer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class ObjectMemoryBuffer : public MemoryBuffer {
5656
private:
5757
SmallVector<char, 0> SV;
5858
std::string BufferName;
59+
void anchor() override;
5960
};
6061

6162
} // namespace llvm

lib/ExecutionEngine/MCJIT/MCJIT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include "llvm/ADT/SmallVector.h"
1515
#include "llvm/ExecutionEngine/ExecutionEngine.h"
1616
#include "llvm/ExecutionEngine/ObjectCache.h"
17-
#include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
1817
#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
1918
#include "llvm/ExecutionEngine/RuntimeDyld.h"
2019
#include "llvm/IR/Module.h"
20+
#include "llvm/Support/ObjectMemoryBuffer.h"
2121

2222
namespace llvm {
2323
class MCJIT;

lib/LTO/LLVMBuild.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,3 @@ required_libraries =
3737
Support
3838
Target
3939
TransformUtils
40-
MCJIT

lib/LTO/ThinLTOCodeGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "llvm/Bitcode/BitcodeReader.h"
2424
#include "llvm/Bitcode/BitcodeWriter.h"
2525
#include "llvm/Bitcode/BitcodeWriterPass.h"
26-
#include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
2726
#include "llvm/IR/DebugInfo.h"
2827
#include "llvm/IR/DiagnosticPrinter.h"
2928
#include "llvm/IR/LLVMContext.h"
@@ -37,6 +36,7 @@
3736
#include "llvm/Support/CachePruning.h"
3837
#include "llvm/Support/Debug.h"
3938
#include "llvm/Support/Error.h"
39+
#include "llvm/Support/ObjectMemoryBuffer.h"
4040
#include "llvm/Support/Path.h"
4141
#include "llvm/Support/SHA1.h"
4242
#include "llvm/Support/TargetRegistry.h"

lib/Support/MemoryBuffer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "llvm/Support/Errno.h"
1919
#include "llvm/Support/FileSystem.h"
2020
#include "llvm/Support/MathExtras.h"
21+
#include "llvm/Support/ObjectMemoryBuffer.h"
2122
#include "llvm/Support/Path.h"
2223
#include "llvm/Support/Process.h"
2324
#include "llvm/Support/Program.h"
@@ -533,3 +534,4 @@ MemoryBufferRef MemoryBuffer::getMemBufferRef() const {
533534
}
534535

535536
void MemoryBuffer::anchor() {}
537+
void ObjectMemoryBuffer::anchor() {}

0 commit comments

Comments
 (0)