[llvm] r352830 - Fix compilation of examples after 13680223b9d8 / r352827
James Y Knight via llvm-commits
llvm-commits at lists.llvm.org
Thu Jan 31 19:23:42 PST 2019
Author: jyknight
Date: Thu Jan 31 19:23:42 2019
New Revision: 352830
URL: http://llvm.org/viewvc/llvm-project?rev=352830&view=rev
Log:
Fix compilation of examples after 13680223b9d8 / r352827
Who knew...they're not built by default or as part of the tests.
Modified:
llvm/trunk/examples/BrainF/BrainF.cpp
llvm/trunk/examples/BrainF/BrainF.h
llvm/trunk/examples/BrainF/BrainFDriver.cpp
llvm/trunk/examples/ParallelJIT/ParallelJIT.cpp
Modified: llvm/trunk/examples/BrainF/BrainF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/BrainF/BrainF.cpp?rev=352830&r1=352829&r2=352830&view=diff
==============================================================================
--- llvm/trunk/examples/BrainF/BrainF.cpp (original)
+++ llvm/trunk/examples/BrainF/BrainF.cpp Thu Jan 31 19:23:42 2019
@@ -82,7 +82,8 @@ void BrainF::header(LLVMContext& C) {
//Function header
//define void @brainf()
- brainf_func = module->getOrInsertFunction("brainf", Type::getVoidTy(C));
+ brainf_func = Function::Create(FunctionType::get(Type::getVoidTy(C), false),
+ Function::ExternalLinkage, "brainf", module);
builder = new IRBuilder<>(BasicBlock::Create(C, label, brainf_func));
Modified: llvm/trunk/examples/BrainF/BrainF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/BrainF/BrainF.h?rev=352830&r1=352829&r2=352830&view=diff
==============================================================================
--- llvm/trunk/examples/BrainF/BrainF.h (original)
+++ llvm/trunk/examples/BrainF/BrainF.h Thu Jan 31 19:23:42 2019
@@ -78,7 +78,7 @@ class BrainF {
CompileFlags comflag;
std::istream *in;
Module *module;
- FunctionCallee brainf_func;
+ Function *brainf_func;
FunctionCallee getchar_func;
FunctionCallee putchar_func;
Value *ptr_arr;
Modified: llvm/trunk/examples/BrainF/BrainFDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/BrainF/BrainFDriver.cpp?rev=352830&r1=352829&r2=352830&view=diff
==============================================================================
--- llvm/trunk/examples/BrainF/BrainFDriver.cpp (original)
+++ llvm/trunk/examples/BrainF/BrainFDriver.cpp Thu Jan 31 19:23:42 2019
@@ -75,9 +75,10 @@ void addMainFunction(Module *mod) {
FunctionType *main_func_fty = FunctionType::get(
Type::getInt32Ty(mod->getContext()),
{Type::getInt32Ty(mod->getContext()),
- Type::getInt8Ty(mod->getContext())->getPointerTo()->getPointerTo()});
+ Type::getInt8Ty(mod->getContext())->getPointerTo()->getPointerTo()},
+ false);
Function *main_func =
- Function::create(main_func_fty, Function::ExternalLinkage, "main", mod);
+ Function::Create(main_func_fty, Function::ExternalLinkage, "main", mod);
{
Function::arg_iterator args = main_func->arg_begin();
Modified: llvm/trunk/examples/ParallelJIT/ParallelJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/ParallelJIT/ParallelJIT.cpp?rev=352830&r1=352829&r2=352830&view=diff
==============================================================================
--- llvm/trunk/examples/ParallelJIT/ParallelJIT.cpp (original)
+++ llvm/trunk/examples/ParallelJIT/ParallelJIT.cpp Thu Jan 31 19:23:42 2019
@@ -47,6 +47,7 @@
using namespace llvm;
static Function* createAdd1(Module *M) {
+ LLVMContext &Context = M->getContext();
// 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".
Function *Add1F =
@@ -56,10 +57,10 @@ static Function* createAdd1(Module *M) {
// Add a basic block to the function. As before, it automatically inserts
// because of the last argument.
- BasicBlock *BB = BasicBlock::Create(M->getContext(), "EntryBlock", Add1F);
+ BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", Add1F);
// Get pointers to the constant `1'.
- Value *One = ConstantInt::get(Type::getInt32Ty(M->getContext()), 1);
+ Value *One = ConstantInt::get(Type::getInt32Ty(Context), 1);
// Get pointers to the integer argument of the add1 function...
assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg
@@ -70,13 +71,14 @@ static Function* createAdd1(Module *M) {
Instruction *Add = BinaryOperator::CreateAdd(One, ArgX, "addresult", BB);
// Create the return instruction and add it to the basic block
- ReturnInst::Create(M->getContext(), Add, BB);
+ ReturnInst::Create(Context, Add, BB);
// Now, function add1 is ready.
return Add1F;
}
static Function *CreateFibFunction(Module *M) {
+ LLVMContext &Context = M->getContext();
// Create the fib function and insert it into module M. This function is said
// to return an int and take an int parameter.
FunctionType *FibFTy = FunctionType::get(Type::getInt32Ty(Context),
@@ -85,27 +87,27 @@ static Function *CreateFibFunction(Modul
Function::Create(FibFTy, Function::ExternalLinkage, "fib", M);
// Add a basic block to the function.
- BasicBlock *BB = BasicBlock::Create(M->getContext(), "EntryBlock", FibF);
+ BasicBlock *BB = BasicBlock::Create(Context, "EntryBlock", FibF);
// Get pointers to the constants.
- Value *One = ConstantInt::get(Type::getInt32Ty(M->getContext()), 1);
- Value *Two = ConstantInt::get(Type::getInt32Ty(M->getContext()), 2);
+ Value *One = ConstantInt::get(Type::getInt32Ty(Context), 1);
+ 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.
ArgX->setName("AnArg"); // Give it a nice symbolic name for fun.
// Create the true_block.
- BasicBlock *RetBB = BasicBlock::Create(M->getContext(), "return", FibF);
+ BasicBlock *RetBB = BasicBlock::Create(Context, "return", FibF);
// Create an exit block.
- BasicBlock* RecurseBB = BasicBlock::Create(M->getContext(), "recurse", FibF);
+ BasicBlock *RecurseBB = BasicBlock::Create(Context, "recurse", FibF);
// Create the "if (arg < 2) goto exitbb"
Value *CondInst = new ICmpInst(*BB, ICmpInst::ICMP_SLE, ArgX, Two, "cond");
BranchInst::Create(RetBB, RecurseBB, CondInst, BB);
// Create: ret int 1
- ReturnInst::Create(M->getContext(), One, RetBB);
+ ReturnInst::Create(Context, One, RetBB);
// create fib(x-1)
Value *Sub = BinaryOperator::CreateSub(ArgX, One, "arg", RecurseBB);
@@ -120,7 +122,7 @@ static Function *CreateFibFunction(Modul
BinaryOperator::CreateAdd(CallFibX1, CallFibX2, "addresult", RecurseBB);
// Create the return instruction and add it to the basic block
- ReturnInst::Create(M->getContext(), Sum, RecurseBB);
+ ReturnInst::Create(Context, Sum, RecurseBB);
return FibF;
}
More information about the llvm-commits
mailing list