Skip to content

Commit c3be168

Browse files
committed
Merge pull request #479 in G/truffleruby from cleanup/find-exported-symbol to master
* commit '304bcca8b50c65c15eeb5fd5f32ed06907154fa1': Avoid using deprecated automatic LLVM function exports in backtraces test.
2 parents ec92ef2 + 304bcca commit c3be168

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

test/truffle/cexts/backtraces/bin/backtraces

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def puts_backtrace(backtrace)
1313
end
1414

1515
puts "Test error in Ruby => C ext support => Ruby"
16-
RB_FUNCALLV = Truffle::Interop.import('@rb_funcallv')
16+
RB_FUNCALLV = Truffle::Interop.import('rb_funcallv')
1717

1818
def callback
1919
raise 'Ruby callback error'
@@ -37,7 +37,7 @@ end
3737
puts
3838
puts "Test with an internal error from rb_mutex_lock()"
3939
LOCK = Mutex.new
40-
RB_MUTEX_LOCK = Truffle::Interop.import('@rb_mutex_lock')
40+
RB_MUTEX_LOCK = Truffle::Interop.import('rb_mutex_lock')
4141

4242
LOCK.lock
4343

test/truffle/cexts/backtraces/ext/backtraces/backtraces.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,8 @@ void Init_backtraces() {
4949
rb_define_module_function(module, "foo", &foo, 1);
5050
rb_define_module_function(module, "qsort", call_qsort, 1);
5151
rb_define_module_function(module, "native_callback", native_callback, 1);
52+
53+
// used in the main script of the test
54+
polyglot_export("rb_funcallv", &rb_funcallv);
55+
polyglot_export("rb_mutex_lock", &rb_mutex_lock);
5256
}

0 commit comments

Comments
 (0)