Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea3d84fef086
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ffb5c31af3a
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on May 20, 2016

  1. Copy the full SHA
    a493778 View commit details
  2. Copy the full SHA
    2ffb5c3 View commit details
Binary file modified lib/ruby/truffle/cext/ruby.su
Binary file not shown.
1 change: 0 additions & 1 deletion spec/ruby/optional/capi/ext/jruby_truffle.h
Original file line number Diff line number Diff line change
@@ -27,7 +27,6 @@
#undef HAVE_RB_ARY_FREEZE
#undef HAVE_RB_ARY_INCLUDES
#undef HAVE_RB_ARY_JOIN
#undef HAVE_RB_ARY_NEW
#undef HAVE_RB_ARY_NEW2
#undef HAVE_RB_ARY_NEW3
#ifdef RUBY_VERSION_IS_2_1
1 change: 0 additions & 1 deletion spec/truffle/tags/optional/capi/array_tags.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
fails:C-API Array function rb_Array returns obj if it is an array
fails:C-API Array function rb_Array tries to convert obj to an array
fails:C-API Array function rb_Array returns obj wrapped in an array if it cannot be converted to an array
fails:C-API Array function rb_ary_new returns an empty array
fails:C-API Array function rb_ary_new2 returns an empty array
fails:C-API Array function rb_ary_new3 returns an array with the passed cardinality and varargs
fails:C-API Array function rb_ary_new_from_args returns an array with the passed cardinality and varargs
4 changes: 2 additions & 2 deletions truffle/src/main/c/cext/ruby.c
Original file line number Diff line number Diff line change
@@ -214,11 +214,11 @@ VALUE rb_define_module_under(VALUE module, const char *name) {
}

void rb_define_method(VALUE module, const char *name, void *function, int args) {
truffle_invoke(RUBY_CEXT, "rb_define_method", module, truffle_read_string(name), function, args);
truffle_invoke(RUBY_CEXT, "rb_define_method", module, truffle_read_string(name), truffle_address_to_function(function), args);
}

void rb_define_private_method(VALUE module, const char *name, void *function, int args) {
truffle_invoke(RUBY_CEXT, "rb_define_private_method", module, truffle_read_string(name), function, args);
truffle_invoke(RUBY_CEXT, "rb_define_private_method", module, truffle_read_string(name), truffle_address_to_function(function), args);
}

void rb_define_module_function(VALUE module, const char *name, void *function, int args) {