Use JRuby implementation for TruffleRuby #149
Conversation
Fix GH-145 lib/fiddle/truffleruby.rb uses lib/fiddle/jruby.rb. lib/fiddle/jruby.rb uses FFI API. So we can use it for TruffleRuby too.
eregon
left a comment
eregon
left a comment
There was a problem hiding this comment.
This looks great, I'd like to investigate a couple things.
test/fiddle/test_closure.rb
Outdated
| class TestClosure < Fiddle::TestCase | ||
| def setup | ||
| if RUBY_ENGINE == "truffleruby" | ||
| omit("FFI::Function don't accept #call-able object with TruffleRuby") |
There was a problem hiding this comment.
I'll look into this, TruffleRuby does pass most FFI gem tests so it's surprising, maybe this is not well tested or is not an officially supported API.
| n_fixed_args.step(args.size - 1, 2) do |i| | ||
| if args[i] == :const_string || args[i] == Types::CONST_STRING | ||
| args[i + 1] = String.try_convert(args[i + 1]) || args[i + 1] | ||
| end |
There was a problem hiding this comment.
I think it would be good to rename this file to ffi_backend.rb or so and avoid a JRuby namespace since it is effectively independent from JRuby but it doesn't like that currently due to file naming and things like Fiddle::JRuby.
It's helpful to have a small diff at this point though, so I think that's best done later, maybe even in a separate PR.
There was a problem hiding this comment.
I think that we don't need to do it because this is a short-term workaround for TruffleRuby.
This file will be used by only JRuby eventually.
There was a problem hiding this comment.
Since the FFI backend seems to work well I think we should just use it long term, for both JRuby and TruffleRuby.
It's also nice to have 2 backends instead of 3.
* The issue is Fiddle structs have #to_ptr returning a CStructEntity and not a FFI::Pointer. So both Fiddle and FFI use #to_ptr and we need explicit coercion.
* TruffleRuby requires a Proc or Method as the callable.
eregon
force-pushed
the
truffleruby-ffi
branch
from
428a648 to
7f19b0b
Compare
| assert_equal("1349", buff, bug4929) | ||
|
|
||
| # Ensure the test didn't mutate String literals | ||
| assert_equal("93" + "41", untouched) |
There was a problem hiding this comment.
Without the added + above this was failing, which meant Fiddle tests were permanently changing the meaning of all "9341" frozen string literals.
Interestingly this sanity check actually fails on JRuby, I'll file an issue there: jruby/jruby#8365
There was a problem hiding this comment.
The JRuby issue has been fixed on master and will be in JRuby 9.4.9.0.
We won't be updating 9.4 to use the fiddle gem in any case, but the test could be un-omitted now.
eregon
force-pushed
the
truffleruby-ffi
branch
from
7f19b0b to
188ad1f
Compare
eregon
left a comment
eregon
left a comment
There was a problem hiding this comment.
I think this is ready, I am happy with this solution.
eregon
force-pushed
the
truffleruby-ffi
branch
from
188ad1f to
3e11fad
Compare
Fix GH-145
Rename
lib/fiddle/jruby.rbtolib/fiddle/ffi_backend.rbas a generic ffi gem API based implementation.JRuby and TruffleRuby use
lib/fiddle/ffi_backend.rb.