MJIT: Merge mjit_compiler.rb into mjit.rb

There are too many mjit_compiler.* files. It was hard to find files.

5 files changed, 13 insertions, 20 deletions

diff --git a/common.mk b/common.mk
index cdfac0a2a8..9645cee332 100644
--- a/common.mk
+++ b/common.mk
@@ -1085,7 +1085,6 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/marshal.rb \
 		$(srcdir)/mjit.rb \
 		$(srcdir)/mjit_c.rb \
-		$(srcdir)/mjit_compiler.rb \
 		$(srcdir)/pack.rb \
 		$(srcdir)/trace_point.rb \
 		$(srcdir)/warning.rb \
@@ -9584,7 +9583,6 @@ miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
 miniinit.$(OBJEXT): {$(VPATH)}missing.h
 miniinit.$(OBJEXT): {$(VPATH)}mjit.rb
 miniinit.$(OBJEXT): {$(VPATH)}mjit_c.rb
-miniinit.$(OBJEXT): {$(VPATH)}mjit_compiler.rb
 miniinit.$(OBJEXT): {$(VPATH)}nilclass.rb
 miniinit.$(OBJEXT): {$(VPATH)}node.h
 miniinit.$(OBJEXT): {$(VPATH)}numeric.rb
@@ -10027,7 +10025,6 @@ mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_c.rbinc
 mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compile_attr.inc
 mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.c
 mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.h
-mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_compiler.rbinc
 mjit_compiler.$(OBJEXT): {$(VPATH)}mjit_unit.h
 mjit_compiler.$(OBJEXT): {$(VPATH)}node.h
 mjit_compiler.$(OBJEXT): {$(VPATH)}ruby_assert.h
diff --git a/inits.c b/inits.c
index 17fa0afbb6..e809b56cc9 100644
--- a/inits.c
+++ b/inits.c
@@ -108,7 +108,6 @@ rb_call_builtin_inits(void)
 #if USE_MJIT
     BUILTIN(mjit);
     BUILTIN(mjit_c);
-    BUILTIN(mjit_compiler);
 #endif
     Init_builtin_prelude();
 }
diff --git a/mjit.rb b/mjit.rb
index baa107d6dc..64c746f915 100644
--- a/mjit.rb
+++ b/mjit.rb
@@ -11,3 +11,16 @@ module RubyVM::MJIT
     Primitive.cexpr! 'mjit_resume()'
   end
 end
+
+if RubyVM::MJIT.enabled?
+  begin
+    require 'fiddle'
+    require 'fiddle/import'
+  rescue LoadError
+    return # miniruby doesn't support MJIT
+  end
+
+  require "mjit/c_type"
+  require "mjit/instruction"
+  require "mjit/compiler"
+end
diff --git a/mjit_compiler.c b/mjit_compiler.c
index 1982ad925c..6b2ff433e2 100644
--- a/mjit_compiler.c
+++ b/mjit_compiler.c
@@ -173,6 +173,4 @@ extern bool rb_splat_or_kwargs_p(const struct rb_callinfo *restrict ci);
 
 #include "mjit_c.rbinc"
 
-#include "mjit_compiler.rbinc"
-
 #endif // USE_MJIT
diff --git a/mjit_compiler.rb b/mjit_compiler.rb
deleted file mode 100644
index 51dc9e774f..0000000000
--- a/mjit_compiler.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-# TODO: Merge this to mjit.rb
-if RubyVM::MJIT.enabled?
-  begin
-    require 'fiddle'
-    require 'fiddle/import'
-  rescue LoadError
-    return # skip miniruby
-  end
-
-  require "mjit/c_type"
-  require "mjit/instruction"
-  require "mjit/compiler"
-end