[Orc] Move Orc code into a namespace (llvm::orc), update Kaleidoscope code.

NFC.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230143 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames
2015-02-21 20:44:36 +00:00
parent 59d81dbafb
commit 8d353ae157
19 changed files with 85 additions and 24 deletions

View File

@@ -4,15 +4,16 @@
#include "llvm/IR/Module.h"
#include "llvm/Transforms/Utils/Cloning.h"
using namespace llvm;
namespace llvm {
namespace orc {
void llvm::copyGVInitializer(GlobalVariable &New, const GlobalVariable &Orig,
void copyGVInitializer(GlobalVariable &New, const GlobalVariable &Orig,
ValueToValueMapTy &VMap) {
if (Orig.hasInitializer())
New.setInitializer(MapValue(Orig.getInitializer(), VMap));
}
void llvm::copyFunctionBody(Function &New, const Function &Orig,
void copyFunctionBody(Function &New, const Function &Orig,
ValueToValueMapTy &VMap) {
if (!Orig.isDeclaration()) {
Function::arg_iterator DestI = New.arg_begin();
@@ -27,9 +28,9 @@ void llvm::copyFunctionBody(Function &New, const Function &Orig,
}
}
void llvm::CloneSubModule(llvm::Module &Dst, const Module &Src,
HandleGlobalVariableFtor HandleGlobalVariable,
HandleFunctionFtor HandleFunction, bool CloneInlineAsm) {
void CloneSubModule(llvm::Module &Dst, const Module &Src,
HandleGlobalVariableFtor HandleGlobalVariable,
HandleFunctionFtor HandleFunction, bool CloneInlineAsm) {
ValueToValueMapTy VMap;
@@ -102,3 +103,6 @@ void llvm::CloneSubModule(llvm::Module &Dst, const Module &Src,
}
}
} // End namespace orc.
} // End namespace llvm.

View File

@@ -8,6 +8,7 @@
using namespace llvm;
namespace llvm {
namespace orc {
GlobalVariable* createImplPointer(Function &F, const Twine &Name,
Constant *Initializer) {
@@ -106,4 +107,5 @@ FullyPartitionedModule fullyPartition(Module &M) {
return MP;
}
}
} // End namespace orc.
} // End namespace llvm.

View File

@@ -13,7 +13,7 @@
namespace {
static struct RegisterJIT {
RegisterJIT() { llvm::OrcMCJITReplacement::Register(); }
RegisterJIT() { llvm::orc::OrcMCJITReplacement::Register(); }
} JITRegistrator;
}
@@ -21,6 +21,7 @@ static struct RegisterJIT {
extern "C" void LLVMLinkInOrcMCJITReplacement() {}
namespace llvm {
namespace orc {
GenericValue
OrcMCJITReplacement::runFunction(Function *F,
@@ -122,4 +123,6 @@ OrcMCJITReplacement::runFunction(Function *F,
llvm_unreachable("Full-featured argument passing not supported yet!");
}
}
} // End namespace orc.
} // End namespace llvm.

View File

@@ -22,6 +22,7 @@
#include "llvm/Object/Archive.h"
namespace llvm {
namespace orc {
class OrcMCJITReplacement : public ExecutionEngine {
@@ -104,11 +105,12 @@ class OrcMCJITReplacement : public ExecutionEngine {
};
private:
static ExecutionEngine *
createOrcMCJITReplacement(std::string *ErrorMsg,
std::unique_ptr<RTDyldMemoryManager> OrcJMM,
std::unique_ptr<llvm::TargetMachine> TM) {
return new llvm::OrcMCJITReplacement(std::move(OrcJMM), std::move(TM));
std::unique_ptr<TargetMachine> TM) {
return new OrcMCJITReplacement(std::move(OrcJMM), std::move(TM));
}
public:
@@ -323,6 +325,8 @@ private:
std::vector<object::OwningBinary<object::Archive>> Archives;
};
}
} // End namespace orc.
} // End namespace llvm.
#endif // LLVM_LIB_EXECUTIONENGINE_ORC_MCJITREPLACEMENT_H

View File

@@ -2,7 +2,7 @@
#include "llvm/ExecutionEngine/Orc/OrcTargetSupport.h"
#include <array>
using namespace llvm;
using namespace llvm::orc;
namespace {
@@ -47,6 +47,7 @@ uint64_t executeCompileCallback(JITCompileCallbackManagerBase<TargetT> *JCBM,
}
namespace llvm {
namespace orc {
const char* OrcX86_64::ResolverBlockName = "orc_resolver_block";
@@ -123,4 +124,5 @@ OrcX86_64::insertCompileCallbackTrampolines(Module &M,
return GetLabelName;
}
}
} // End namespace orc.
} // End namespace llvm.