Merge pull request #112 from eregon/foreign_exception_fixes

Adapt ExecJS::GraalJSRuntime to foreign exception changes in TruffleRuby
rails · Mar 2, 2022 · 610e88a · 610e88a
2 parents e6db400 + 4cb60fa
commit 610e88a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/execjs/graaljs_runtime.rb b/lib/execjs/graaljs_runtime.rb
@@ -46,16 +46,18 @@ def call(source, *args)
 
       private
 
+      ForeignException = defined?(Polyglot::ForeignException) ? Polyglot::ForeignException : ::RuntimeError
+
       def translate
         convert_js_to_ruby yield
-      rescue ::RuntimeError => e
+      rescue ForeignException => e
         if e.message.start_with?('SyntaxError:')
           error_class = ExecJS::RuntimeError
         else
           error_class = ExecJS::ProgramError
         end
 
-        backtrace = e.backtrace.map { |line| line.sub('(eval)', '(execjs)') }
+        backtrace = (e.backtrace || []).map { |line| line.sub('(eval)', '(execjs)') }
         raise error_class, e.message, backtrace
       end