Move #raise-related helpers to ExceptionOperations and load it earlier

Author: eregon

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -1141,6 +1141,7 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/string.rb",
             "/core/random.rb",
             "/core/truffle/kernel_operations.rb",
+            "/core/truffle/exception_operations.rb",
             "/core/truffle/feature_loader.rb",
             "/core/truffle/gem_util.rb",
             "/core/thread.rb",
@@ -1155,7 +1156,6 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/truffle/boot.rb",
             "/core/truffle/debug.rb",
             "/core/truffle/encoding_operations.rb",
-            "/core/truffle/exception_operations.rb",
             "/core/truffle/hash_operations.rb",
             "/core/truffle/numeric_operations.rb",
             "/core/truffle/proc_operations.rb",

src/main/ruby/truffleruby/core/kernel.rb

@@ -662,14 +662,14 @@ def raise(exc = undefined, msg = undefined, ctx = nil)
     if Primitive.undefined?(exc) and last
       exc = last
     else
-      exc = Truffle::KernelOperations.build_exception_for_raise(exc, msg)
+      exc = Truffle::ExceptionOperations.build_exception_for_raise(exc, msg)
 
       exc.set_context ctx if ctx
       exc.capture_backtrace!(1) unless exc.backtrace?
       Primitive.exception_set_cause exc, last unless Primitive.object_equal(exc, last)
     end
 
-    Truffle::KernelOperations.show_exception_for_debug(exc, 1) if $DEBUG
+    Truffle::ExceptionOperations.show_exception_for_debug(exc, 1) if $DEBUG
 
     Primitive.vm_raise_exception exc
   end

src/main/ruby/truffleruby/core/thread.rb

@@ -285,12 +285,12 @@ def inspect
   def raise(exc = undefined, msg = undefined, ctx = nil)
     return nil unless alive?
 
-    exc = Truffle::KernelOperations.build_exception_for_raise(exc, msg)
+    exc = Truffle::ExceptionOperations.build_exception_for_raise(exc, msg)
 
     exc.set_context ctx if ctx
     exc.capture_backtrace!(1) unless exc.backtrace?
 
-    Truffle::KernelOperations.show_exception_for_debug(exc, 1) if $DEBUG
+    Truffle::ExceptionOperations.show_exception_for_debug(exc, 1) if $DEBUG
 
     if self == Thread.current
       Primitive.vm_raise_exception exc

src/main/ruby/truffleruby/core/truffle/exception_operations.rb

@@ -10,6 +10,39 @@
 
 module Truffle
   module ExceptionOperations
+    def self.build_exception_for_raise(exc, msg)
+      if Primitive.undefined? exc
+        ::RuntimeError.exception ''
+      elsif exc.respond_to? :exception
+        if Primitive.undefined? msg
+          exc = exc.exception
+        else
+          exc = exc.exception msg
+        end
+
+        exception_class_object_expected! unless Primitive.object_kind_of?(exc, ::Exception)
+        exc
+      elsif exc.kind_of? ::String
+        ::RuntimeError.exception exc
+      else
+        exception_class_object_expected!
+      end
+    end
+
+    # Avoid using #raise here to prevent infinite recursion
+    def self.exception_class_object_expected!
+      exc = ::TypeError.new('exception class/object expected')
+      exc.capture_backtrace!(1)
+
+      show_exception_for_debug(exc, 2) if $DEBUG
+
+      Primitive.vm_raise_exception exc
+    end
+
+    def self.show_exception_for_debug(exc, uplevel)
+      STDERR.puts "Exception: `#{exc.class}' at #{caller(uplevel + 1, 1)[0]} - #{exc.message}\n"
+    end
+
     def self.class_name(receiver)
       Truffle::Type.object_class(receiver).name
     end

src/main/ruby/truffleruby/core/truffle/kernel_operations.rb

@@ -128,39 +128,6 @@ def self.load_error(name)
       load_error
     end
 
-    def self.build_exception_for_raise(exc, msg)
-      if Primitive.undefined? exc
-        ::RuntimeError.exception ''
-      elsif exc.respond_to? :exception
-        if Primitive.undefined? msg
-          exc = exc.exception
-        else
-          exc = exc.exception msg
-        end
-
-        exception_class_object_expected! unless Primitive.object_kind_of?(exc, ::Exception)
-        exc
-      elsif exc.kind_of? ::String
-        ::RuntimeError.exception exc
-      else
-        exception_class_object_expected!
-      end
-    end
-
-    # Avoid using #raise here to prevent infinite recursion
-    def self.exception_class_object_expected!
-      exc = ::TypeError.new('exception class/object expected')
-      exc.capture_backtrace!(1)
-
-      Truffle::KernelOperations.show_exception_for_debug(exc, 2) if $DEBUG
-
-      Primitive.vm_raise_exception exc
-    end
-
-    def self.show_exception_for_debug(exc, uplevel)
-      STDERR.puts "Exception: `#{exc.class}' at #{caller(uplevel + 1, 1)[0]} - #{exc.message}\n"
-    end
-
     def self.check_last_line(line)
       unless Primitive.object_kind_of? line, String
         raise TypeError, "$_ value need to be String (#{Truffle::ExceptionOperations.to_class_name(line)} given)"