diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-08-31 15:14:22 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-08-31 15:14:22 +0200 |
commit | c793b92d6c5c748ac04a31923a625964bfe814fb (patch) | |
tree | b04e110f752fcadbce88562a8c54d2f938cb0a8d /eval | |
parent | ba1d347604287a2acb1ea664c3a46d2918021d6f (diff) |
Always use new signature for CreateCall.
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp index a34ab2a09f9..ad182115054 100644 --- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp +++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp @@ -200,12 +200,8 @@ struct FunctionBuilder : public NodeVisitor, public NodeTraverser { } assert(pass_params == PassParams::LAZY); assert(params.size() == 2); -#if LLVM_VERSION_MAJOR >= 11 return builder.CreateCall(llvm::cast<llvm::FunctionType>(params[0]->getType()->getPointerElementType()), params[0], {params[1], builder.getInt64(idx)}, "resolve_param"); -#else - return builder.CreateCall(params[0], {params[1], builder.getInt64(idx)}, "resolve_param"); -#endif } //------------------------------------------------------------------------- @@ -257,22 +253,14 @@ struct FunctionBuilder : public NodeVisitor, public NodeTraverser { llvm::Value *eval_fun = builder.CreateIntToPtr(builder.getInt64((uint64_t)eval_ptr), eval_funptr_t, "inject_eval"); llvm::Value *ctx = builder.CreateIntToPtr(builder.getInt64((uint64_t)forest), builder.getVoidTy()->getPointerTo(), "inject_ctx"); if (pass_params == PassParams::ARRAY) { -#if LLVM_VERSION_MAJOR >= 11 push(builder.CreateCall(llvm::cast<llvm::FunctionType>(eval_fun->getType()->getPointerElementType()), eval_fun, {ctx, params[0]}, "call_eval")); -#else - push(builder.CreateCall(eval_fun, {ctx, params[0]}, "call_eval")); -#endif } else { assert(pass_params == PassParams::LAZY); llvm::PointerType *proxy_funptr_t = make_eval_forest_proxy_funptr_t(); llvm::Value *proxy_fun = builder.CreateIntToPtr(builder.getInt64((uint64_t)vespalib_eval_forest_proxy), proxy_funptr_t, "inject_eval_proxy"); -#if LLVM_VERSION_MAJOR >= 11 push(builder.CreateCall(llvm::cast<llvm::FunctionType>(proxy_fun->getType()->getPointerElementType()), proxy_fun, {eval_fun, ctx, params[0], params[1], builder.getInt64(stats.num_params)})); -#else - push(builder.CreateCall(proxy_fun, {eval_fun, ctx, params[0], params[1], builder.getInt64(stats.num_params)})); -#endif } return true; } @@ -426,12 +414,8 @@ struct FunctionBuilder : public NodeVisitor, public NodeTraverser { llvm::PointerType *funptr_t = make_check_membership_funptr_t(); llvm::Value *call_fun = builder.CreateIntToPtr(builder.getInt64((uint64_t)call_ptr), funptr_t, "inject_call_addr"); llvm::Value *ctx = builder.CreateIntToPtr(builder.getInt64((uint64_t)state), builder.getVoidTy()->getPointerTo(), "inject_ctx"); -#if LLVM_VERSION_MAJOR >= 11 push(builder.CreateCall(llvm::cast<llvm::FunctionType>(call_fun->getType()->getPointerElementType()), call_fun, {ctx, lhs}, "call_check_membership")); -#else - push(builder.CreateCall(call_fun, {ctx, lhs}, "call_check_membership")); -#endif } else { // build explicit code to check all set members llvm::Value *found = builder.getFalse(); |