X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=examples%2FFibonacci%2Ffibonacci.cpp;h=ecb49eb92e1ac9b3f41e7edd47d1f799c5cc0cd4;hb=e15387964886dcb3d919648218da958f9707d988;hp=40137c3a051d047c9e076e76c3b5f6742b6e8fae;hpb=875710a2fd6b3c4f814961582594bd5c1cdb493a;p=oota-llvm.git diff --git a/examples/Fibonacci/fibonacci.cpp b/examples/Fibonacci/fibonacci.cpp index 40137c3a051..ecb49eb92e1 100644 --- a/examples/Fibonacci/fibonacci.cpp +++ b/examples/Fibonacci/fibonacci.cpp @@ -33,6 +33,7 @@ #include "llvm/IR/Module.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/raw_ostream.h" + using namespace llvm; static Function *CreateFibFunction(Module *M, LLVMContext &Context) { @@ -41,7 +42,7 @@ static Function *CreateFibFunction(Module *M, LLVMContext &Context) { Function *FibF = cast(M->getOrInsertFunction("fib", Type::getInt32Ty(Context), Type::getInt32Ty(Context), - (Type *)0)); + nullptr)); // Add a basic block to the function. BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", FibF); @@ -51,7 +52,7 @@ static Function *CreateFibFunction(Module *M, LLVMContext &Context) { Value *Two = ConstantInt::get(Type::getInt32Ty(Context), 2); // Get pointer to the integer argument of the add1 function... - Argument *ArgX = FibF->arg_begin(); // Get the arg. + Argument *ArgX = &*FibF->arg_begin(); // Get the arg. ArgX->setName("AnArg"); // Give it a nice symbolic name for fun. // Create the true_block. @@ -87,7 +88,6 @@ static Function *CreateFibFunction(Module *M, LLVMContext &Context) { return FibF; } - int main(int argc, char **argv) { int n = argc > 1 ? atol(argv[1]) : 24; @@ -95,17 +95,17 @@ int main(int argc, char **argv) { LLVMContext Context; // Create some module to put our function into it. - std::unique_ptr M(new Module("test", Context)); + std::unique_ptr Owner(new Module("test", Context)); + Module *M = Owner.get(); // We are about to create the "fib" function: - Function *FibF = CreateFibFunction(M.get(), Context); + Function *FibF = CreateFibFunction(M, Context); // Now we going to create JIT std::string errStr; ExecutionEngine *EE = - EngineBuilder(M.get()) + EngineBuilder(std::move(Owner)) .setErrorStr(&errStr) - .setEngineKind(EngineKind::JIT) .create(); if (!EE) {