bootsnap 1.9.4 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7602567343afc549df266a1b3def7e8c1e755b03a9ce486d17bba7051e97dfda
-  data.tar.gz: 607abfa5738cb016172bba2eb94af48b80b9e73dddea1090be77b7ca7d9f121d
+  metadata.gz: 96a4b41c02dc01b416bd262f43812b9541479330e4b073d428a6f0186fe07f9a
+  data.tar.gz: b221e0b0ce1da0552a7c08e1dd1ce84daab07129b834fd2bdec82f01a8645c50
 SHA512:
-  metadata.gz: 7effd658adb07d075cfbc883f47382c23f774a872fcfa2daa0b137ff5f903057a1f825a90cd96cd5784a2e72fcb583ce05b4fcf98201a2a2cb6830c90109e096
-  data.tar.gz: ed2f42c2e5e91c373c8882fbe17abfab93c43e6ab39b83a7aa3031d6dba48088da9c3a271b52bbb7bc83ace117d677ec25e4865936972d939a00b08580f5e45e
+  metadata.gz: 27c071b0a4efceb864931a673f7889fc95110f1ed8de4b50c17c99ecd4d62230321d14a23f346129f1f2198dc6a3222370e5bf8f105f52299799ba78aa361741
+  data.tar.gz: d5546dd05eaf860178526dc3bdcd33546f80cdcc5ebdb748ebf0b1fe8b813efed15387ea5835f4ab846775261d6df05e4d15df28ff81abb04ab795232435a194

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Unreleased
 
+# 1.10.0
+
+* Delay requiring `FileUtils`. (#285)
+  `FileUtils` can be installed as a gem, so it's best to wait for bundler to have setup the load path before requiring it.
+
+* Improve support of Psych 4. (#392)
+  Since `1.8.0`, `YAML.load_file` was no longer cached when Psych 4 was used. This is because `load_file` loads
+  in safe mode by default, so the Bootsnap cache could defeat that safety.
+  Now when precompiling YAML files, Bootsnap first try to parse them in safe mode, and if it can't fallback to unsafe mode,
+  and the cache contains a flag that records wether it was generated in safe mode or not.
+  `YAML.unsafe_load_file` will use safe caches just fine, but `YAML.load_file` will fallback to uncached YAML parsing
+  if the cache was generated using unsafe parsing.
+
+* Minimize the Kernel.require extra stack frames. (#393)
+  This should reduce the noise generated by bootsnap on `LoadError`.
+
 # 1.9.4
 
 * Ignore absolute paths in the loaded feature index. (#385)

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Shopify, Inc.
+Copyright (c) 2017-present Shopify, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -41,7 +41,7 @@ getting progressively slower, this is almost certainly the cause.**
 It's technically possible to simply specify `gem 'bootsnap', require: 'bootsnap/setup'`, but it's
 important to load Bootsnap as early as possible to get maximum performance improvement.
 
-You can see how this require works [here](https://github.com/Shopify/bootsnap/blob/master/lib/bootsnap/setup.rb).
+You can see how this require works [here](https://github.com/Shopify/bootsnap/blob/main/lib/bootsnap/setup.rb).
 
 If you are not using Rails, or if you are but want more control over things, add this to your
 application setup immediately after `require 'bundler/setup'` (i.e. as early as possible: the sooner
@@ -161,7 +161,7 @@ The only directories considered "stable" are things under the Ruby install prefi
 "volatile".
 
 In addition to the [`Bootsnap::LoadPathCache::Cache`
-source](https://github.com/Shopify/bootsnap/blob/master/lib/bootsnap/load_path_cache/cache.rb),
+source](https://github.com/Shopify/bootsnap/blob/main/lib/bootsnap/load_path_cache/cache.rb),
 this diagram may help clarify how entry resolution works:
 
 ![How path searching works](https://cloud.githubusercontent.com/assets/3074765/25388270/670b5652-299b-11e7-87fb-975647f68981.png)

data/exe/bootsnap

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bootsnap/cli'
+require "bootsnap/cli"
 exit Bootsnap::CLI.new(ARGV).run

data/ext/bootsnap/bootsnap.c

@@ -75,7 +75,7 @@ struct bs_cache_key {
 STATIC_ASSERT(sizeof(struct bs_cache_key) == KEY_SIZE);
 
 /* Effectively a schema version. Bumping invalidates all previous caches */
-static const uint32_t current_version = 3;
+static const uint32_t current_version = 4;
 
 /* hash of e.g. "x86_64-darwin17", invalidating when ruby is recompiled on a
  * new OS ABI, etc. */
@@ -91,8 +91,7 @@ static mode_t current_umask;
 static VALUE rb_mBootsnap;
 static VALUE rb_mBootsnap_CompileCache;
 static VALUE rb_mBootsnap_CompileCache_Native;
-static VALUE rb_eBootsnap_CompileCache_Uncompilable;
-static ID uncompilable;
+static VALUE rb_cBootsnap_CompileCache_UNCOMPILABLE;
 static ID instrumentation_method;
 static VALUE sym_miss;
 static VALUE sym_stale;
@@ -120,10 +119,8 @@ static uint32_t get_ruby_platform(void);
  * exception.
  */
 static int bs_storage_to_output(VALUE handler, VALUE args, VALUE storage_data, VALUE * output_data);
-static VALUE prot_storage_to_output(VALUE arg);
 static VALUE prot_input_to_output(VALUE arg);
 static void bs_input_to_output(VALUE handler, VALUE args, VALUE input_data, VALUE * output_data, int * exception_tag);
-static VALUE prot_input_to_storage(VALUE arg);
 static int bs_input_to_storage(VALUE handler, VALUE args, VALUE input_data, VALUE pathval, VALUE * storage_data);
 struct s2o_data;
 struct i2o_data;
@@ -151,12 +148,12 @@ Init_bootsnap(void)
   rb_mBootsnap = rb_define_module("Bootsnap");
   rb_mBootsnap_CompileCache = rb_define_module_under(rb_mBootsnap, "CompileCache");
   rb_mBootsnap_CompileCache_Native = rb_define_module_under(rb_mBootsnap_CompileCache, "Native");
-  rb_eBootsnap_CompileCache_Uncompilable = rb_define_class_under(rb_mBootsnap_CompileCache, "Uncompilable", rb_eStandardError);
+  rb_cBootsnap_CompileCache_UNCOMPILABLE = rb_const_get(rb_mBootsnap_CompileCache, rb_intern("UNCOMPILABLE"));
+  rb_global_variable(&rb_cBootsnap_CompileCache_UNCOMPILABLE);
 
   current_ruby_revision = get_ruby_revision();
   current_ruby_platform = get_ruby_platform();
 
-  uncompilable = rb_intern("__bootsnap_uncompilable__");
   instrumentation_method = rb_intern("_instrument");
 
   sym_miss = ID2SYM(rb_intern("miss"));
@@ -426,6 +423,7 @@ open_current_file(char * path, struct bs_cache_key * key, const char ** errno_pr
 #define ERROR_WITH_ERRNO -1
 #define CACHE_MISS -2
 #define CACHE_STALE -3
+#define CACHE_UNCOMPILABLE -4
 
 /*
  * Read the cache key from the given fd, which must have position 0 (e.g.
@@ -507,14 +505,14 @@ fetch_cached_data(int fd, ssize_t data_size, VALUE handler, VALUE args, VALUE *
   if (data_size > 100000000000) {
     *errno_provenance = "bs_fetch:fetch_cached_data:datasize";
     errno = EINVAL; /* because wtf? */
-    ret = -1;
+    ret = ERROR_WITH_ERRNO;
     goto done;
   }
   data = ALLOC_N(char, data_size);
   nread = read(fd, data, data_size);
   if (nread < 0) {
     *errno_provenance = "bs_fetch:fetch_cached_data:read";
-    ret = -1;
+    ret = ERROR_WITH_ERRNO;
     goto done;
   }
   if (nread != data_size) {
@@ -525,6 +523,10 @@ fetch_cached_data(int fd, ssize_t data_size, VALUE handler, VALUE args, VALUE *
   storage_data = rb_str_new(data, data_size);
 
   *exception_tag = bs_storage_to_output(handler, args, storage_data, output_data);
+  if (*output_data == rb_cBootsnap_CompileCache_UNCOMPILABLE) {
+    ret = CACHE_UNCOMPILABLE;
+    goto done;
+  }
   ret = 0;
 done:
   if (data != NULL) xfree(data);
@@ -737,7 +739,15 @@ bs_fetch(char * path, VALUE path_v, char * cache_path, VALUE handler, VALUE args
       &output_data, &exception_tag, &errno_provenance
     );
     if (exception_tag != 0) goto raise;
-    else if (res == CACHE_MISS || res == CACHE_STALE) valid_cache = 0;
+    else if (res == CACHE_UNCOMPILABLE) {
+      /* If fetch_cached_data returned `Uncompilable` we fallback to `input_to_output`
+        This happens if we have say, an unsafe YAML cache, but try to load it in safe mode */
+      if (bs_read_contents(current_fd, current_key.size, &contents, &errno_provenance) < 0) goto fail_errno;
+      input_data = rb_str_new(contents, current_key.size);
+      bs_input_to_output(handler, args, input_data, &output_data, &exception_tag);
+      if (exception_tag != 0) goto raise;
+      goto succeed;
+    } else if (res == CACHE_MISS || res == CACHE_STALE) valid_cache = 0;
     else if (res == ERROR_WITH_ERRNO) goto fail_errno;
     else if (!NIL_P(output_data)) goto succeed; /* fast-path, goal */
   }
@@ -754,7 +764,7 @@ bs_fetch(char * path, VALUE path_v, char * cache_path, VALUE handler, VALUE args
   if (exception_tag != 0) goto raise;
   /* If input_to_storage raised Bootsnap::CompileCache::Uncompilable, don't try
    * to cache anything; just return input_to_output(input_data) */
-  if (storage_data == uncompilable) {
+  if (storage_data == rb_cBootsnap_CompileCache_UNCOMPILABLE) {
     bs_input_to_output(handler, args, input_data, &output_data, &exception_tag);
     if (exception_tag != 0) goto raise;
     goto succeed;
@@ -772,9 +782,13 @@ bs_fetch(char * path, VALUE path_v, char * cache_path, VALUE handler, VALUE args
   exception_tag = bs_storage_to_output(handler, args, storage_data, &output_data);
   if (exception_tag != 0) goto raise;
 
-  /* If output_data is nil, delete the cache entry and generate the output
-   * using input_to_output */
-  if (NIL_P(output_data)) {
+  if (output_data == rb_cBootsnap_CompileCache_UNCOMPILABLE) {
+    /* If storage_to_output returned `Uncompilable` we fallback to `input_to_output` */
+    bs_input_to_output(handler, args, input_data, &output_data, &exception_tag);
+    if (exception_tag != 0) goto raise;
+  } else if (NIL_P(output_data)) {
+    /* If output_data is nil, delete the cache entry and generate the output
+     * using input_to_output */
     if (unlink(cache_path) < 0) {
       errno_provenance = "bs_fetch:unlink";
       goto fail_errno;
@@ -856,7 +870,7 @@ bs_precompile(char * path, VALUE path_v, char * cache_path, VALUE handler)
 
   /* If input_to_storage raised Bootsnap::CompileCache::Uncompilable, don't try
    * to cache anything; just return false */
-  if (storage_data == uncompilable) {
+  if (storage_data == rb_cBootsnap_CompileCache_UNCOMPILABLE) {
     goto fail;
   }
   /* If storage_data isn't a string, we can't cache it */
@@ -919,7 +933,7 @@ struct i2s_data {
 };
 
 static VALUE
-prot_storage_to_output(VALUE arg)
+try_storage_to_output(VALUE arg)
 {
   struct s2o_data * data = (struct s2o_data *)arg;
   return rb_funcall(data->handler, rb_intern("storage_to_output"), 2, data->storage_data, data->args);
@@ -934,7 +948,7 @@ bs_storage_to_output(VALUE handler, VALUE args, VALUE storage_data, VALUE * outp
     .args         = args,
     .storage_data = storage_data,
   };
-  *output_data = rb_protect(prot_storage_to_output, (VALUE)&s2o_data, &state);
+  *output_data = rb_protect(try_storage_to_output, (VALUE)&s2o_data, &state);
   return state;
 }
 
@@ -963,22 +977,6 @@ try_input_to_storage(VALUE arg)
   return rb_funcall(data->handler, rb_intern("input_to_storage"), 2, data->input_data, data->pathval);
 }
 
-static VALUE
-rescue_input_to_storage(VALUE arg, VALUE e)
-{
-  return uncompilable;
-}
-
-static VALUE
-prot_input_to_storage(VALUE arg)
-{
-  struct i2s_data * data = (struct i2s_data *)arg;
-  return rb_rescue2(
-      try_input_to_storage, (VALUE)data,
-      rescue_input_to_storage, Qnil,
-      rb_eBootsnap_CompileCache_Uncompilable, 0);
-}
-
 static int
 bs_input_to_storage(VALUE handler, VALUE args, VALUE input_data, VALUE pathval, VALUE * storage_data)
 {
@@ -988,6 +986,6 @@ bs_input_to_storage(VALUE handler, VALUE args, VALUE input_data, VALUE pathval,
     .input_data = input_data,
     .pathval    = pathval,
   };
-  *storage_data = rb_protect(prot_input_to_storage, (VALUE)&i2s_data, &state);
+  *storage_data = rb_protect(try_input_to_storage, (VALUE)&i2s_data, &state);
   return state;
 }

data/ext/bootsnap/extconf.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
+
 require("mkmf")
 
-if RUBY_ENGINE == 'ruby'
-  $CFLAGS << ' -O3 '
-  $CFLAGS << ' -std=c99'
+if RUBY_ENGINE == "ruby"
+  $CFLAGS << " -O3 "
+  $CFLAGS << " -std=c99"
 
   # ruby.h has some -Wpedantic fails in some cases
   # (e.g. https://github.com/Shopify/bootsnap/issues/15)
-  unless ['0', '', nil].include?(ENV['BOOTSNAP_PEDANTIC'])
-    $CFLAGS << ' -Wall'
-    $CFLAGS << ' -Werror'
-    $CFLAGS << ' -Wextra'
-    $CFLAGS << ' -Wpedantic'
+  unless ["0", "", nil].include?(ENV["BOOTSNAP_PEDANTIC"])
+    $CFLAGS << " -Wall"
+    $CFLAGS << " -Werror"
+    $CFLAGS << " -Wextra"
+    $CFLAGS << " -Wpedantic"
 
-    $CFLAGS << ' -Wno-unused-parameter' # VALUE self has to be there but we don't care what it is.
-    $CFLAGS << ' -Wno-keyword-macro' # hiding return
-    $CFLAGS << ' -Wno-gcc-compat' # ruby.h 2.6.0 on macos 10.14, dunno
+    $CFLAGS << " -Wno-unused-parameter" # VALUE self has to be there but we don't care what it is.
+    $CFLAGS << " -Wno-keyword-macro" # hiding return
+    $CFLAGS << " -Wno-gcc-compat" # ruby.h 2.6.0 on macos 10.14, dunno
+    $CFLAGS << " -Wno-compound-token-split-by-macro"
   end
 
   create_makefile("bootsnap/bootsnap")

data/lib/bootsnap/bundler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bootsnap
   extend(self)
 

data/lib/bootsnap/cli/worker_pool.rb

@@ -63,6 +63,7 @@ module Bootsnap
           loop do
             job, *args = Marshal.load(@pipe_out)
             return if job == :exit
+
             @jobs.fetch(job).call(*args)
           end
         rescue IOError

data/lib/bootsnap/cli.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'bootsnap'
-require 'bootsnap/cli/worker_pool'
-require 'optparse'
-require 'fileutils'
-require 'etc'
+require "bootsnap"
+require "bootsnap/cli/worker_pool"
+require "optparse"
+require "fileutils"
+require "etc"
 
 module Bootsnap
   class CLI
@@ -25,7 +25,7 @@ module Bootsnap
 
     def initialize(argv)
       @argv = argv
-      self.cache_dir = ENV.fetch('BOOTSNAP_CACHE_DIR', 'tmp/cache')
+      self.cache_dir = ENV.fetch("BOOTSNAP_CACHE_DIR", "tmp/cache")
       self.compile_gemfile = false
       self.exclude = nil
       self.verbose = false
@@ -36,16 +36,16 @@ module Bootsnap
     end
 
     def precompile_command(*sources)
-      require 'bootsnap/compile_cache/iseq'
-      require 'bootsnap/compile_cache/yaml'
-      require 'bootsnap/compile_cache/json'
+      require "bootsnap/compile_cache/iseq"
+      require "bootsnap/compile_cache/yaml"
+      require "bootsnap/compile_cache/json"
 
       fix_default_encoding do
-        Bootsnap::CompileCache::ISeq.cache_dir = self.cache_dir
+        Bootsnap::CompileCache::ISeq.cache_dir = cache_dir
         Bootsnap::CompileCache::YAML.init!
-        Bootsnap::CompileCache::YAML.cache_dir = self.cache_dir
+        Bootsnap::CompileCache::YAML.cache_dir = cache_dir
         Bootsnap::CompileCache::JSON.init!
-        Bootsnap::CompileCache::JSON.cache_dir = self.cache_dir
+        Bootsnap::CompileCache::JSON.cache_dir = cache_dir
 
         @work_pool = WorkerPool.create(size: jobs, jobs: {
           ruby: method(:precompile_ruby),
@@ -61,7 +61,7 @@ module Bootsnap
 
         if compile_gemfile
           # Some gems embed their tests, they're very unlikely to be loaded, so not worth precompiling.
-          gem_exclude = Regexp.union([exclude, '/spec/', '/test/'].compact)
+          gem_exclude = Regexp.union([exclude, "/spec/", "/test/"].compact)
           precompile_ruby_files($LOAD_PATH.map { |d| File.expand_path(d) }, exclude: gem_exclude)
 
           # Gems that include JSON or YAML files usually don't put them in `lib/`.
@@ -72,7 +72,7 @@ module Bootsnap
           precompile_json_files(gem_paths, exclude: gem_exclude)
         end
 
-        if exitstatus = @work_pool.shutdown
+        if (exitstatus = @work_pool.shutdown)
           exit(exitstatus)
         end
       end
@@ -89,7 +89,7 @@ module Bootsnap
     if dir_sort
       def list_files(path, pattern)
         if File.directory?(path)
-          Dir[File.join(path,  pattern), sort: false]
+          Dir[File.join(path, pattern), sort: false]
         elsif File.exist?(path)
           [path]
         else
@@ -99,7 +99,7 @@ module Bootsnap
     else
       def list_files(path, pattern)
         if File.directory?(path)
-          Dir[File.join(path,  pattern)]
+          Dir[File.join(path, pattern)]
         elsif File.exist?(path)
           [path]
         else
@@ -126,9 +126,9 @@ module Bootsnap
 
       load_paths.each do |path|
         if !exclude || !exclude.match?(path)
-          list_files(path, '**/*.{yml,yaml}').each do |yaml_file|
+          list_files(path, "**/*.{yml,yaml}").each do |yaml_file|
             # We ignore hidden files to not match the various .ci.yml files
-            if !File.basename(yaml_file).start_with?('.') && (!exclude || !exclude.match?(yaml_file))
+            if !File.basename(yaml_file).start_with?(".") && (!exclude || !exclude.match?(yaml_file))
               @work_pool.push(:yaml, yaml_file)
             end
           end
@@ -138,7 +138,7 @@ module Bootsnap
 
     def precompile_yaml(*yaml_files)
       Array(yaml_files).each do |yaml_file|
-        if CompileCache::YAML.precompile(yaml_file, cache_dir: cache_dir)
+        if CompileCache::YAML.precompile(yaml_file)
           STDERR.puts(yaml_file) if verbose
         end
       end
@@ -149,9 +149,9 @@ module Bootsnap
 
       load_paths.each do |path|
         if !exclude || !exclude.match?(path)
-          list_files(path, '**/*.json').each do |json_file|
+          list_files(path, "**/*.json").each do |json_file|
             # We ignore hidden files to not match the various .config.json files
-            if !File.basename(json_file).start_with?('.') && (!exclude || !exclude.match?(json_file))
+            if !File.basename(json_file).start_with?(".") && (!exclude || !exclude.match?(json_file))
               @work_pool.push(:json, json_file)
             end
           end
@@ -161,7 +161,7 @@ module Bootsnap
 
     def precompile_json(*json_files)
       Array(json_files).each do |json_file|
-        if CompileCache::JSON.precompile(json_file, cache_dir: cache_dir)
+        if CompileCache::JSON.precompile(json_file)
           STDERR.puts(json_file) if verbose
         end
       end
@@ -172,7 +172,7 @@ module Bootsnap
 
       load_paths.each do |path|
         if !exclude || !exclude.match?(path)
-          list_files(path, '**/*.rb').each do |ruby_file|
+          list_files(path, "**/*.rb").each do |ruby_file|
             if !exclude || !exclude.match?(ruby_file)
               @work_pool.push(:ruby, ruby_file)
             end
@@ -183,7 +183,7 @@ module Bootsnap
 
     def precompile_ruby(*ruby_files)
       Array(ruby_files).each do |ruby_file|
-        if CompileCache::ISeq.precompile(ruby_file, cache_dir: cache_dir)
+        if CompileCache::ISeq.precompile(ruby_file)
           STDERR.puts(ruby_file) if verbose
         end
       end
@@ -210,7 +210,7 @@ module Bootsnap
     end
 
     def cache_dir=(dir)
-      @cache_dir = File.expand_path(File.join(dir, 'bootsnap/compile-cache'))
+      @cache_dir = File.expand_path(File.join(dir, "bootsnap/compile-cache"))
     end
 
     def exclude_pattern(pattern)
@@ -225,24 +225,24 @@ module Bootsnap
         opts.separator "GLOBAL OPTIONS"
         opts.separator ""
 
-        help = <<~EOS
+        help = <<~HELP
           Path to the bootsnap cache directory. Defaults to tmp/cache
-        EOS
-        opts.on('--cache-dir DIR', help.strip) do |dir|
+        HELP
+        opts.on("--cache-dir DIR", help.strip) do |dir|
           self.cache_dir = dir
         end
 
-        help = <<~EOS
+        help = <<~HELP
           Print precompiled paths.
-        EOS
-        opts.on('--verbose', '-v', help.strip) do
+        HELP
+        opts.on("--verbose", "-v", help.strip) do
           self.verbose = true
         end
 
-        help = <<~EOS
+        help = <<~HELP
           Number of workers to use. Default to number of processors, set to 0 to disable multi-processing.
-        EOS
-        opts.on('--jobs JOBS', '-j', help.strip) do |jobs|
+        HELP
+        opts.on("--jobs JOBS", "-j", help.strip) do |jobs|
           self.jobs = Integer(jobs)
         end
 
@@ -251,30 +251,30 @@ module Bootsnap
         opts.separator ""
         opts.separator "    precompile [DIRECTORIES...]: Precompile all .rb files in the passed directories"
 
-        help = <<~EOS
+        help = <<~HELP
           Precompile the gems in Gemfile
-        EOS
-        opts.on('--gemfile', help) { self.compile_gemfile = true }
+        HELP
+        opts.on("--gemfile", help) { self.compile_gemfile = true }
 
-        help = <<~EOS
+        help = <<~HELP
           Path pattern to not precompile. e.g. --exclude 'aws-sdk|google-api'
-        EOS
-        opts.on('--exclude PATTERN', help) { |pattern| exclude_pattern(pattern) }
+        HELP
+        opts.on("--exclude PATTERN", help) { |pattern| exclude_pattern(pattern) }
 
-        help = <<~EOS
+        help = <<~HELP
           Disable ISeq (.rb) precompilation.
-        EOS
-        opts.on('--no-iseq', help) { self.iseq = false }
+        HELP
+        opts.on("--no-iseq", help) { self.iseq = false }
 
-        help = <<~EOS
+        help = <<~HELP
           Disable YAML precompilation.
-        EOS
-        opts.on('--no-yaml', help) { self.yaml = false }
+        HELP
+        opts.on("--no-yaml", help) { self.yaml = false }
 
-        help = <<~EOS
+        help = <<~HELP
           Disable JSON precompilation.
-        EOS
-        opts.on('--no-json', help) { self.json = false }
+        HELP
+        opts.on("--no-json", help) { self.json = false }
       end
     end
   end

data/lib/bootsnap/compile_cache/iseq.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
-require('bootsnap/bootsnap')
-require('zlib')
+
+require("bootsnap/bootsnap")
+require("zlib")
 
 module Bootsnap
   module CompileCache
     module ISeq
       class << self
-        attr_accessor(:cache_dir)
+        attr_reader(:cache_dir)
+
+        def cache_dir=(cache_dir)
+          @cache_dir = cache_dir.end_with?("/") ? "#{cache_dir}iseq" : "#{cache_dir}-iseq"
+        end
       end
 
       has_ruby_bug_18250 = begin # https://bugs.ruby-lang.org/issues/18250
@@ -23,27 +28,27 @@ module Bootsnap
           iseq = begin
             RubyVM::InstructionSequence.compile_file(path)
           rescue SyntaxError
-            raise(Uncompilable, 'syntax error')
+            return UNCOMPILABLE # syntax error
           end
 
           begin
             iseq.to_binary
           rescue TypeError
-            raise(Uncompilable, 'ruby bug #18250')
+            return UNCOMPILABLE # ruby bug #18250
           end
         end
       else
         def self.input_to_storage(_, path)
           RubyVM::InstructionSequence.compile_file(path).to_binary
         rescue SyntaxError
-          raise(Uncompilable, 'syntax error')
+          return UNCOMPILABLE # syntax error
         end
       end
 
       def self.storage_to_output(binary, _args)
         RubyVM::InstructionSequence.load_from_binary(binary)
-      rescue RuntimeError => e
-        if e.message == 'broken binary format'
+      rescue RuntimeError => error
+        if error.message == "broken binary format"
           STDERR.puts("[Bootsnap::CompileCache] warning: rejecting broken binary")
           nil
         else
@@ -60,7 +65,7 @@ module Bootsnap
         )
       end
 
-      def self.precompile(path, cache_dir: ISeq.cache_dir)
+      def self.precompile(path)
         Bootsnap::CompileCache::Native.precompile(
           cache_dir,
           path.to_s,
@@ -80,8 +85,8 @@ module Bootsnap
           Bootsnap::CompileCache::ISeq.fetch(path.to_s)
         rescue Errno::EACCES
           Bootsnap::CompileCache.permission_error(path)
-        rescue RuntimeError => e
-          if e.message =~ /unmatched platform/
+        rescue RuntimeError => error
+          if error.message =~ /unmatched platform/
             puts("unmatched platform for file #{path}")
           end
           raise

data/lib/bootsnap/compile_cache/json.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
-require('bootsnap/bootsnap')
+
+require("bootsnap/bootsnap")
 
 module Bootsnap
   module CompileCache
     module JSON
       class << self
-        attr_accessor(:msgpack_factory, :cache_dir, :supported_options)
+        attr_accessor(:msgpack_factory, :supported_options)
+        attr_reader(:cache_dir)
+
+        def cache_dir=(cache_dir)
+          @cache_dir = cache_dir.end_with?("/") ? "#{cache_dir}json" : "#{cache_dir}-json"
+        end
 
         def input_to_storage(payload, _)
           obj = ::JSON.parse(payload)
@@ -13,7 +19,7 @@ module Bootsnap
         end
 
         def storage_to_output(data, kwargs)
-          if kwargs && kwargs.key?(:symbolize_names)
+          if kwargs&.key?(:symbolize_names)
             kwargs[:symbolize_keys] = kwargs.delete(:symbolize_names)
           end
           msgpack_factory.load(data, kwargs)
@@ -23,7 +29,7 @@ module Bootsnap
           ::JSON.parse(data, **(kwargs || {}))
         end
 
-        def precompile(path, cache_dir: self.cache_dir)
+        def precompile(path)
           Bootsnap::CompileCache::Native.precompile(
             cache_dir,
             path.to_s,
@@ -40,22 +46,23 @@ module Bootsnap
         end
 
         def init!
-          require('json')
-          require('msgpack')
+          require("json")
+          require("msgpack")
 
           self.msgpack_factory = MessagePack::Factory.new
           self.supported_options = [:symbolize_names]
           if ::JSON.parse('["foo"]', freeze: true).first.frozen?
             self.supported_options = [:freeze]
           end
-          self.supported_options.freeze
+          supported_options.freeze
         end
       end
 
       module Patch
         def load_file(path, *args)
           return super if args.size > 1
-          if kwargs = args.first
+
+          if (kwargs = args.first)
             return super unless kwargs.is_a?(Hash)
             return super unless (kwargs.keys - ::Bootsnap::CompileCache::JSON.supported_options).empty?
           end