Move get_class_name into cruby

Author: tekknolagi

zjit/src/cruby.rs

@@ -1106,6 +1106,18 @@ pub mod test_utils {
 #[cfg(test)]
 pub use test_utils::*;
 
+/// Get class name from a class pointer.
+pub fn get_class_name(class: VALUE) -> String {
+    // type checks for rb_class2name()
+    if unsafe { RB_TYPE_P(class, RUBY_T_MODULE) || RB_TYPE_P(class, RUBY_T_CLASS) } {
+        Some(class)
+    } else {
+        None
+    }.and_then(|class| unsafe {
+        cstr_to_rust_string(rb_class2name(class))
+    }).unwrap_or_else(|| "Unknown".to_string())
+}
+
 /// Interned ID values for Ruby symbols and method names.
 /// See [type@crate::cruby::ID] and usages outside of YJIT.
 pub(crate) mod ids {

zjit/src/hir.rs

@@ -5,7 +5,7 @@ use crate::{
     cruby::*, options::get_option, hir_type::types::Fixnum, options::DumpHIR, profile::get_or_create_iseq_payload
 };
 use std::{cell::RefCell, collections::{HashMap, HashSet}, ffi::c_void, mem::{align_of, size_of}, ptr, slice::Iter};
-use crate::hir_type::{Type, types, get_class_name};
+use crate::hir_type::{Type, types};
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
 pub struct InsnId(pub usize);

zjit/src/hir_type/mod.rs

@@ -2,6 +2,7 @@
 use crate::cruby::{Qfalse, Qnil, Qtrue, VALUE, RUBY_T_ARRAY, RUBY_T_STRING, RUBY_T_HASH};
 use crate::cruby::{rb_cInteger, rb_cFloat, rb_cArray, rb_cHash, rb_cString, rb_cSymbol, rb_cObject, rb_cTrueClass, rb_cFalseClass, rb_cNilClass};
 use crate::cruby::ClassRelationship;
+use crate::cruby::get_class_name;
 use crate::hir::PtrPrintMap;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -63,20 +64,6 @@ pub struct Type {
 
 include!("hir_type.inc.rs");
 
-/// Get class name from a class pointer.
-pub fn get_class_name(class: VALUE) -> String {
-    use crate::cruby::{RB_TYPE_P, RUBY_T_MODULE, RUBY_T_CLASS};
-    use crate::cruby::{cstr_to_rust_string, rb_class2name};
-    // type checks for rb_class2name()
-    if unsafe { RB_TYPE_P(class, RUBY_T_MODULE) || RB_TYPE_P(class, RUBY_T_CLASS) } {
-        Some(class)
-    } else {
-        None
-    }.and_then(|class| unsafe {
-        cstr_to_rust_string(rb_class2name(class))
-    }).unwrap_or_else(|| "Unknown".to_string())
-}
-
 fn write_spec(f: &mut std::fmt::Formatter, printer: &TypePrinter) -> std::fmt::Result {
     let ty = printer.inner;
     match ty.spec {