2 files changed, 9 insertions, 9 deletions
diff --git a/tool/ruby_vm/helpers/c_escape.rb b/tool/ruby_vm/helpers/c_escape.rb
index 34fafd1e34..2a99e408da 100644
--- a/tool/ruby_vm/helpers/c_escape.rb
+++ b/tool/ruby_vm/helpers/c_escape.rb
@@ -17,7 +17,10 @@ module RubyVM::CEscape
 
   # generate comment, with escaps.
   def commentify str
-    return "/* #{str.b.gsub('*/', '*\\/').gsub('/*', '/\\*')} */"
+    unless str = str.dump[/\A"\K.*(?="\z)/]
+      raise Encoding::CompatibilityError, "must be ASCII-compatible (#{str.encoding})"
+    end
+    return "/* #{str.gsub('*/', '*\\/').gsub('/*', '/\\*')} */"
   end
 
   # Mimic gensym of CL.
diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb
index 98104f4b92..8a04041da9 100644
--- a/tool/ruby_vm/helpers/dumper.rb
+++ b/tool/ruby_vm/helpers/dumper.rb
@@ -28,16 +28,12 @@ class RubyVM::Dumper
     path  = Pathname.new(__FILE__)
     path  = (path.relative_path_from(Pathname.pwd) rescue path).dirname
     path += '../views'
-    path += spec
-    src   = path.read mode: 'rt:utf-8:utf-8'
+    path += Pathname.pwd.join(spec).expand_path.to_s.sub("#{@base}/", '')
+    src   = path.expand_path.read mode: 'rt:utf-8:utf-8'
   rescue Errno::ENOENT
     raise "don't know how to generate #{path}"
   else
-    if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-      erb = ERB.new(src, trim_mode: '%-')
-    else
-      erb = ERB.new(src, nil, '%-')
-    end
+    erb = ERB.new(src, trim_mode: '%-')
     erb.filename = path.to_path
     return erb
   end
@@ -85,10 +81,11 @@ class RubyVM::Dumper
       . join
   end
 
-  def initialize dst
+  def initialize dst, base
     @erb   = {}
     @empty = new_binding
     @file  = cstr dst.to_path
+    @base  = base
   end
 
   def render partial, opts = { :locals => {} }