projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r258436:
[oota-llvm.git]
/
examples
/
HowToUseJIT
/
HowToUseJIT.cpp
diff --git
a/examples/HowToUseJIT/HowToUseJIT.cpp
b/examples/HowToUseJIT/HowToUseJIT.cpp
index 8e3b6dc4a2733c8c41b9eefa2efc52e596deceb7..e0bf6a00bf017d84c0d1dac409a0f77d9c03108d 100644
(file)
--- a/
examples/HowToUseJIT/HowToUseJIT.cpp
+++ b/
examples/HowToUseJIT/HowToUseJIT.cpp
@@
-34,17
+34,19
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/ExecutionEngine/JIT.h"
-#include "llvm/ExecutionEngine/Interpreter.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm/ExecutionEngine/GenericValue.h"
-#include "llvm/Target/TargetSelect.h"
+#include "llvm/ExecutionEngine/Interpreter.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/raw_ostream.h"
+
using namespace llvm;
int main() {
using namespace llvm;
int main() {
@@
-54,7
+56,8
@@
int main() {
LLVMContext Context;
// Create some module to put our function into it.
LLVMContext Context;
// Create some module to put our function into it.
- Module *M = new Module("test", Context);
+ std::unique_ptr<Module> Owner = make_unique<Module>("test", Context);
+ Module *M = Owner.get();
// Create the add1 function entry and insert this entry into module M. The
// function will have a return type of "int" and take an argument of "int".
// Create the add1 function entry and insert this entry into module M. The
// function will have a return type of "int" and take an argument of "int".
@@
-62,50
+65,56
@@
int main() {
Function *Add1F =
cast<Function>(M->getOrInsertFunction("add1", Type::getInt32Ty(Context),
Type::getInt32Ty(Context),
Function *Add1F =
cast<Function>(M->getOrInsertFunction("add1", Type::getInt32Ty(Context),
Type::getInt32Ty(Context),
-
(Type *)0
));
+
nullptr
));
// Add a basic block to the function. As before, it automatically inserts
// because of the last argument.
BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", Add1F);
// Add a basic block to the function. As before, it automatically inserts
// because of the last argument.
BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", Add1F);
+ // Create a basic block builder with default parameters. The builder will
+ // automatically append instructions to the basic block `BB'.
+ IRBuilder<> builder(BB);
+
// Get pointers to the constant `1'.
// Get pointers to the constant `1'.
- Value *One =
ConstantInt::get(Type::getInt32Ty(Context),
1);
+ Value *One =
builder.getInt32(
1);
// Get pointers to the integer argument of the add1 function...
assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg
// Get pointers to the integer argument of the add1 function...
assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg
- Argument *ArgX =
Add1F->arg_begin();
// Get the arg
+ Argument *ArgX =
&*Add1F->arg_begin();
// Get the arg
ArgX->setName("AnArg"); // Give it a nice symbolic name for fun.
// Create the add instruction, inserting it into the end of BB.
ArgX->setName("AnArg"); // Give it a nice symbolic name for fun.
// Create the add instruction, inserting it into the end of BB.
-
Instruction *Add = BinaryOperator::CreateAdd(One, ArgX, "addresult", BB
);
+
Value *Add = builder.CreateAdd(One, ArgX
);
// Create the return instruction and add it to the basic block
// Create the return instruction and add it to the basic block
-
ReturnInst::Create(Context, Add, BB
);
+
builder.CreateRet(Add
);
// Now, function add1 is ready.
// Now, function add1 is ready.
-
- // Now we going to create function `foo', which returns an int and takes no
+ // Now we're going to create function `foo', which returns an int and takes no
// arguments.
Function *FooF =
cast<Function>(M->getOrInsertFunction("foo", Type::getInt32Ty(Context),
// arguments.
Function *FooF =
cast<Function>(M->getOrInsertFunction("foo", Type::getInt32Ty(Context),
-
(Type *)0
));
+
nullptr
));
// Add a basic block to the FooF function.
BB = BasicBlock::Create(Context, "EntryBlock", FooF);
// Add a basic block to the FooF function.
BB = BasicBlock::Create(Context, "EntryBlock", FooF);
- // Get pointers to the constant `10'.
- Value *Ten = ConstantInt::get(Type::getInt32Ty(Context), 10);
+ // Tell the basic block builder to attach itself to the new basic block
+ builder.SetInsertPoint(BB);
+
+ // Get pointer to the constant `10'.
+ Value *Ten = builder.getInt32(10);
- // Pass Ten to the call
call:
- CallInst *Add1CallRes =
CallInst::Create(Add1F, Ten, "add1", BB
);
+ // Pass Ten to the call
to Add1F
+ CallInst *Add1CallRes =
builder.CreateCall(Add1F, Ten
);
Add1CallRes->setTailCall(true);
// Create the return instruction and add it to the basic block.
Add1CallRes->setTailCall(true);
// Create the return instruction and add it to the basic block.
-
ReturnInst::Create(Context, Add1CallRes, BB
);
+
builder.CreateRet(Add1CallRes
);
// Now we create the JIT.
// Now we create the JIT.
- ExecutionEngine* EE = EngineBuilder(
M
).create();
+ ExecutionEngine* EE = EngineBuilder(
std::move(Owner)
).create();
outs() << "We just constructed this LLVM module:\n\n" << *M;
outs() << "\n\nRunning foo: ";
outs() << "We just constructed this LLVM module:\n\n" << *M;
outs() << "\n\nRunning foo: ";
@@
-117,7
+126,6
@@
int main() {
// Import result of execution:
outs() << "Result: " << gv.IntVal << "\n";
// Import result of execution:
outs() << "Result: " << gv.IntVal << "\n";
- EE->freeMachineCodeForFunction(FooF);
delete EE;
llvm_shutdown();
return 0;
delete EE;
llvm_shutdown();
return 0;