The rb_nativethread_lock functions need to be inlined as they take a …

…pointer to a Ruby object variable
tinchi · Mar 30, 2017 · e5bdde9 · e5bdde9
1 parent b74c5ba
commit e5bdde9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/lib/cext/ruby.h b/lib/cext/ruby.h
@@ -1008,10 +1008,10 @@ typedef void *rb_nativethread_id_t;
 typedef void *rb_nativethread_lock_t;
 
 rb_nativethread_id_t rb_nativethread_self();
-int rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock);
-int rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock);
-int rb_nativethread_lock_lock(rb_nativethread_lock_t *lock);
-int rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock);
+MUST_INLINE int rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock);
+MUST_INLINE int rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock);
+MUST_INLINE int rb_nativethread_lock_lock(rb_nativethread_lock_t *lock);
+MUST_INLINE int rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock);
 
 // IO
 
@@ -1149,6 +1149,26 @@ VALUE *rb_ruby_debug_ptr(void);
 
 // Inline implementations
 
+MUST_INLINE int rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock) {
+  *lock = truffle_invoke(RUBY_CEXT, "rb_nativethread_lock_initialize");
+  return 0;
+}
+
+MUST_INLINE int rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock) {
+  *lock = NULL;
+  return 0;
+}
+
+MUST_INLINE int rb_nativethread_lock_lock(rb_nativethread_lock_t *lock) {
+  truffle_invoke(*lock, "lock");
+  return 0;
+}
+
+MUST_INLINE int rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock) {
+  truffle_invoke(*lock, "unlock");
+  return 0;
+}
+
 MUST_INLINE int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp) {
   if (rb_obj_is_kind_of(range, rb_cRange)) {
     *begp = (VALUE) truffle_invoke(range, "begin");

diff --git a/truffleruby/src/main/c/cext/ruby.c b/truffleruby/src/main/c/cext/ruby.c
@@ -2232,26 +2232,6 @@ rb_nativethread_id_t rb_nativethread_self() {
   return (VALUE) truffle_invoke(RUBY_CEXT, "rb_nativethread_self");
 }
 
-int rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock) {
-  *lock = truffle_invoke(RUBY_CEXT, "rb_nativethread_lock_initialize");
-  return 0;
-}
-
-int rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock) {
-  *lock = NULL;
-  return 0;
-}
-
-int rb_nativethread_lock_lock(rb_nativethread_lock_t *lock) {
-  truffle_invoke(lock, "lock");
-  return 0;
-}
-
-int rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock) {
-  truffle_invoke(lock, "unlock");
-  return 0;
-}
-
 // IO
 
 void rb_io_check_writable(rb_io_t *io) {