From bb4cbd0803c3297ad036008adc7a01159ce44e1e Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Wed, 21 Dec 2022 22:46:15 -0800
Subject: [PATCH] Put RubyVM::MJIT::Compiler under ruby_vm directory (#6989)

[Misc #19250]
---
 .gitignore                                                | 2 +-
 common.mk                                                 | 6 +++---
 lib/{ => ruby_vm}/mjit/c_pointer.rb                       | 0
 lib/{ => ruby_vm}/mjit/c_type.rb                          | 0
 lib/{ => ruby_vm}/mjit/compiler.rb                        | 0
 mjit.rb                                                   | 8 ++++----
 .../views/lib/{ => ruby_vm}/mjit/instruction.rb.erb       | 0
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename lib/{ => ruby_vm}/mjit/c_pointer.rb (100%)
 rename lib/{ => ruby_vm}/mjit/c_type.rb (100%)
 rename lib/{ => ruby_vm}/mjit/compiler.rb (100%)
 rename tool/ruby_vm/views/lib/{ => ruby_vm}/mjit/instruction.rb.erb (100%)

diff --git a/.gitignore b/.gitignore
index 535c4fb789..99d32a1825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -238,7 +238,7 @@ lcov*.info
 
 # MJIT
 /include/ruby-*/*/rb_mjit_min_header-*.h
-/lib/mjit/instruction.rb
+/lib/ruby_vm/mjit/instruction.rb
 /mjit_config.h
 /rb_mjit_header.h
 
diff --git a/common.mk b/common.mk
index 0d41d24947..8021f03a58 100644
--- a/common.mk
+++ b/common.mk
@@ -235,9 +235,9 @@ all: $(SHOWFLAGS) main docs
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
-main: $(srcdir)/lib/mjit/instruction.rb
-srcs: $(srcdir)/lib/mjit/instruction.rb
-$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
+main: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+srcs: $(srcdir)/lib/ruby_vm/mjit/instruction.rb
+$(srcdir)/lib/ruby_vm/mjit/instruction.rb: $(tooldir)/insns2vm.rb $(tooldir)/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb $(srcdir)/insns.def
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb --basedir="$(srcdir)" $(INSNS2VMOPT) $@
 
diff --git a/lib/mjit/c_pointer.rb b/lib/ruby_vm/mjit/c_pointer.rb
similarity index 100%
rename from lib/mjit/c_pointer.rb
rename to lib/ruby_vm/mjit/c_pointer.rb
diff --git a/lib/mjit/c_type.rb b/lib/ruby_vm/mjit/c_type.rb
similarity index 100%
rename from lib/mjit/c_type.rb
rename to lib/ruby_vm/mjit/c_type.rb
diff --git a/lib/mjit/compiler.rb b/lib/ruby_vm/mjit/compiler.rb
similarity index 100%
rename from lib/mjit/compiler.rb
rename to lib/ruby_vm/mjit/compiler.rb
diff --git a/mjit.rb b/mjit.rb
index 64c1c69c1a..7391451a6c 100644
--- a/mjit.rb
+++ b/mjit.rb
@@ -20,10 +20,10 @@ if RubyVM::MJIT.enabled?
     return # miniruby doesn't support MJIT
   end
 
-  RubyVM::MJIT::C = Object.new # forward declaration for mjit/compiler
-  require "mjit/c_type"
-  require "mjit/instruction"
-  require "mjit/compiler"
+  RubyVM::MJIT::C = Object.new # forward declaration for ruby_vm/mjit/compiler
+  require 'ruby_vm/mjit/c_type'
+  require 'ruby_vm/mjit/instruction'
+  require 'ruby_vm/mjit/compiler'
 
   module RubyVM::MJIT
     private_constant(*constants)
diff --git a/tool/ruby_vm/views/lib/mjit/instruction.rb.erb b/tool/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb
similarity index 100%
rename from tool/ruby_vm/views/lib/mjit/instruction.rb.erb
rename to tool/ruby_vm/views/lib/ruby_vm/mjit/instruction.rb.erb