Skip to content

Commit

Permalink
Merge branch 'stw' into codedb-ffi-io
Browse files Browse the repository at this point in the history
  • Loading branch information
brixen committed Mar 23, 2016
2 parents 13d677b + 29f702e commit 52275eb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions machine/llvm/inline.cpp
Expand Up @@ -934,7 +934,7 @@ namespace rubinius {
check << "State";

Value* check_args[] = { ops_.state() };
check.call("rbx_enter_unmanaged", check_args, 1, "unused", ops_.b());
check.call("rbx_enter_unmanaged", check_args, 1, "enter_unmanaged", ops_.b());

Type* return_type = find_type(ops_, nf->ffi_data->ret_info.type);

Expand All @@ -945,7 +945,7 @@ namespace rubinius {

Value* ffi_result = ops_.b().CreateCall(ep_ptr, ffi_args, "ffi_result");

check.call("rbx_exit_unmanaged", check_args, 2, "unused", ops_.b());
check.call("rbx_exit_unmanaged", check_args, 1, "exit_unmanaged", ops_.b());

Value* res_args[] = { ops_.state(), ffi_result };

Expand Down

0 comments on commit 52275eb

Please sign in to comment.