Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use JRuby implementation for TruffleRuby #149

Merged
merged 6 commits into from
Oct 10, 2024
Merged

Use JRuby implementation for TruffleRuby #149

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
418bd89
Use JRuby implementation for TruffleRuby
kou Oct 7, 2024
0631d46
Simplify coercion logic in Fiddle::Function#call
eregon Oct 8, 2024
fc3be9c
Fix TestFunc#test_qsort1 to not permanently mutate all "9341" string …
eregon Oct 8, 2024
41c21f5
Fix Fiddle::Closure on TruffleRuby
eregon Oct 8, 2024
bf06273
Rename the FFI backend since it is no longer JRuby-specific
eregon Oct 8, 2024
3e11fad
Fix return in ensure hiding test errors
eregon Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions test/fiddle/test_func.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,20 @@ def call(x, y)
qsort = Function.new(@libc['qsort'],
[TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP],
TYPE_VOID)
buff = "9341"
untouched = "9341"
buff = +"9341"
qsort.call(buff, buff.size, 1, callback)
assert_equal("1349", buff)

bug4929 = '[ruby-core:37395]'
buff = "9341"
buff = +"9341"
under_gc_stress do
qsort.call(buff, buff.size, 1, callback)
end
assert_equal("1349", buff, bug4929)

# Ensure the test didn't mutate String literals
assert_equal("93" + "41", untouched)
Copy link
Member

@eregon eregon Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

end
ensure
# We can't use ObjectSpace with JRuby.
Expand Down