Move yjit_force_enabled? to JITSupport

for consistency
ruby · Mar 12, 2023 · e4caf59 · e4caf59
1 parent 4445b9e
commit e4caf59
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
@@ -3,18 +3,22 @@
 module JITSupport
   module_function
 
-  def rjit_supported?
-    return @rjit_supported if defined?(@rjit_supported)
-    # nil in mswin
-    @rjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['RJIT_SUPPORT'])
-  end
-
   def yjit_supported?
     return @yjit_supported if defined?(@yjit_supported)
     # nil in mswin
     @yjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['YJIT_SUPPORT'])
   end
 
+  def yjit_force_enabled?
+    "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
+  end
+
+  def rjit_supported?
+    return @rjit_supported if defined?(@rjit_supported)
+    # nil in mswin
+    @rjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['RJIT_SUPPORT'])
+  end
+
   def rjit_force_enabled?
     "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?RJIT_FORCE_ENABLE\b/)
   end

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
@@ -151,7 +151,7 @@ def test_verbose
       assert_match(VERSION_PATTERN, r[0])
       if self.class.rjit_enabled? && !JITSupport.rjit_force_enabled?
         assert_equal(NO_JIT_DESCRIPTION, r[0])
-      elsif self.class.yjit_enabled? && !yjit_force_enabled? # checking -DYJIT_FORCE_ENABLE
+      elsif self.class.yjit_enabled? && !JITSupport.yjit_force_enabled?
         assert_equal(NO_JIT_DESCRIPTION, r[0])
       else
         assert_equal(RUBY_DESCRIPTION, r[0])
@@ -228,7 +228,7 @@ def test_version
 
   def test_rjit_disabled_version
     return unless JITSupport.rjit_supported?
-    return if yjit_force_enabled?
+    return if JITSupport.yjit_force_enabled?
 
     env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
     [
@@ -246,7 +246,7 @@ def test_rjit_disabled_version
 
   def test_rjit_version
     return unless JITSupport.rjit_supported?
-    return if yjit_force_enabled?
+    return if JITSupport.yjit_force_enabled?
 
     env = { 'RUBY_YJIT_ENABLE' => nil } # unset in children
     [
@@ -1124,10 +1124,4 @@ def test_null_script
     omit "#{IO::NULL} is not a character device" unless File.chardev?(IO::NULL)
     assert_in_out_err([IO::NULL], success: true)
   end
-
-  private
-
-  def yjit_force_enabled?
-    "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?YJIT_FORCE_ENABLE\b/)
-  end
 end