RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix the MSVC build with the new Orc JIT APIs

Browse Source 
llvm-svn: 226949
This commit is contained in:
Reid Kleckner 2015-01-23 22:25:47 +00:00
parent 7d1220168c
commit 96d5245030
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
View File

@ -32,11 +32,17 @@ protected:
/// had been provided by this instance. Higher level layers are responsible
/// for taking any action required to handle the missing symbols.
class LinkedObjectSet {
LinkedObjectSet(const LinkedObjectSet&) LLVM_DELETED_FUNCTION;
void operator=(const LinkedObjectSet&) LLVM_DELETED_FUNCTION;
public:
LinkedObjectSet(std::unique_ptr<RTDyldMemoryManager> MM)
: MM(std::move(MM)), RTDyld(llvm::make_unique<RuntimeDyld>(&*this->MM)),
State(Raw) {}
// MSVC 2012 cannot infer a move constructor, so write it out longhand.
LinkedObjectSet(LinkedObjectSet &&O)
: MM(std::move(O.MM)), RTDyld(std::move(O.RTDyld)), State(O.State) {}
std::unique_ptr<RuntimeDyld::LoadedObjectInfo>
addObject(const object::ObjectFile &Obj) {
return RTDyld->loadObject(Obj);
@ -74,7 +80,7 @@ protected:
public:
/// @brief Handle to a set of loaded objects.
typedef typename LinkedObjectSetListT::iterator ObjSetHandleT;
typedef LinkedObjectSetListT::iterator ObjSetHandleT;
};
/// @brief Default (no-op) action to perform when loading objects.

4
lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
View File

@ -129,7 +129,7 @@ public:
setDataLayout(this->TM->getSubtargetImpl()->getDataLayout());
}
void addModule(std::unique_ptr<Module> M) {
void addModule(std::unique_ptr<Module> M) override {
// If this module doesn't have a DataLayout attached then attach the
// default.
@ -258,7 +258,7 @@ private:
const ObjListT &Objects,
const LoadedObjInfoListT &Infos) const {
M.UnfinalizedSections[H] = std::move(M.SectionsAllocatedSinceLastLoad);
M.SectionsAllocatedSinceLastLoad = {};
M.SectionsAllocatedSinceLastLoad = SectionAddrSet{};
assert(Objects.size() == Infos.size() &&
"Incorrect number of Infos for Objects.");
for (unsigned I = 0; I < Objects.size(); ++I)