projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Const-correct and prevent a copy of a SmallPtrSet.
[oota-llvm.git]
/
lib
/
ExecutionEngine
/
ExecutionEngineBindings.cpp
diff --git
a/lib/ExecutionEngine/ExecutionEngineBindings.cpp
b/lib/ExecutionEngine/ExecutionEngineBindings.cpp
index de707a09d5e928e7e844f978bc455b40961a2107..9ce194c00172aea72ab55e6c661b26daf69ed274 100644
(file)
--- a/
lib/ExecutionEngine/ExecutionEngineBindings.cpp
+++ b/
lib/ExecutionEngine/ExecutionEngineBindings.cpp
@@
-11,7
+11,6
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#define DEBUG_TYPE "jit"
#include "llvm-c/ExecutionEngine.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm-c/ExecutionEngine.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/ExecutionEngine/GenericValue.h"
@@
-23,17
+22,11
@@
using namespace llvm;
using namespace llvm;
+#define DEBUG_TYPE "jit"
+
// Wrapping the C bindings types.
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef)
// Wrapping the C bindings types.
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef)
-inline DataLayout *unwrap(LLVMTargetDataRef P) {
- return reinterpret_cast<DataLayout*>(P);
-}
-
-inline LLVMTargetDataRef wrap(const DataLayout *P) {
- return reinterpret_cast<LLVMTargetDataRef>(const_cast<DataLayout*>(P));
-}
-
inline TargetLibraryInfo *unwrap(LLVMTargetLibraryInfoRef P) {
return reinterpret_cast<TargetLibraryInfo*>(P);
}
inline TargetLibraryInfo *unwrap(LLVMTargetLibraryInfoRef P) {
return reinterpret_cast<TargetLibraryInfo*>(P);
}
@@
-117,7
+110,7
@@
LLVMBool LLVMCreateExecutionEngineForModule(LLVMExecutionEngineRef *OutEE,
LLVMModuleRef M,
char **OutError) {
std::string Error;
LLVMModuleRef M,
char **OutError) {
std::string Error;
- EngineBuilder builder(
unwrap(M
));
+ EngineBuilder builder(
std::unique_ptr<Module>(unwrap(M)
));
builder.setEngineKind(EngineKind::Either)
.setErrorStr(&Error);
if (ExecutionEngine *EE = builder.create()){
builder.setEngineKind(EngineKind::Either)
.setErrorStr(&Error);
if (ExecutionEngine *EE = builder.create()){
@@
-132,7
+125,7
@@
LLVMBool LLVMCreateInterpreterForModule(LLVMExecutionEngineRef *OutInterp,
LLVMModuleRef M,
char **OutError) {
std::string Error;
LLVMModuleRef M,
char **OutError) {
std::string Error;
- EngineBuilder builder(
unwrap(M
));
+ EngineBuilder builder(
std::unique_ptr<Module>(unwrap(M)
));
builder.setEngineKind(EngineKind::Interpreter)
.setErrorStr(&Error);
if (ExecutionEngine *Interp = builder.create()) {
builder.setEngineKind(EngineKind::Interpreter)
.setErrorStr(&Error);
if (ExecutionEngine *Interp = builder.create()) {
@@
-148,7
+141,7
@@
LLVMBool LLVMCreateJITCompilerForModule(LLVMExecutionEngineRef *OutJIT,
unsigned OptLevel,
char **OutError) {
std::string Error;
unsigned OptLevel,
char **OutError) {
std::string Error;
- EngineBuilder builder(
unwrap(M
));
+ EngineBuilder builder(
std::unique_ptr<Module>(unwrap(M)
));
builder.setEngineKind(EngineKind::JIT)
.setErrorStr(&Error)
.setOptLevel((CodeGenOpt::Level)OptLevel);
builder.setEngineKind(EngineKind::JIT)
.setErrorStr(&Error)
.setOptLevel((CodeGenOpt::Level)OptLevel);
@@
-196,7
+189,7
@@
LLVMBool LLVMCreateMCJITCompilerForModule(
targetOptions.EnableFastISel = options.EnableFastISel;
std::string Error;
targetOptions.EnableFastISel = options.EnableFastISel;
std::string Error;
- EngineBuilder builder(
unwrap(M
));
+ EngineBuilder builder(
std::unique_ptr<Module>(unwrap(M)
));
builder.setEngineKind(EngineKind::JIT)
.setErrorStr(&Error)
.setUseMCJIT(true)
builder.setEngineKind(EngineKind::JIT)
.setErrorStr(&Error)
.setUseMCJIT(true)
@@
-286,7
+279,7
@@
void LLVMFreeMachineCodeForFunction(LLVMExecutionEngineRef EE, LLVMValueRef F) {
}
void LLVMAddModule(LLVMExecutionEngineRef EE, LLVMModuleRef M){
}
void LLVMAddModule(LLVMExecutionEngineRef EE, LLVMModuleRef M){
- unwrap(EE)->addModule(
unwrap(M
));
+ unwrap(EE)->addModule(
std::unique_ptr<Module>(unwrap(M)
));
}
void LLVMAddModuleProvider(LLVMExecutionEngineRef EE, LLVMModuleProviderRef MP){
}
void LLVMAddModuleProvider(LLVMExecutionEngineRef EE, LLVMModuleProviderRef MP){