bootsnap 1.24.1 → 1.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86fd14b9f3a5920de24b3faf51c01e36ee19b20fc810ee6780c2ba8447871db9
-  data.tar.gz: 4df2ffc0617e1957f264e7fb72002cec56ffb8bfe6f84534343c1b852c37e5e4
+  metadata.gz: 24c756fe8c17824d00469a5e8e444e6ed9f2710566e623ea8dbd569deb425c83
+  data.tar.gz: aefe758480d38080ff1b0ffd45954dbe7aa992cab3b6f3e6cea7966c2af97696
 SHA512:
-  metadata.gz: 32879429b4f7473a5ed1ea6e32799a3d45d2203a46e867282d0e503396b40acce0a69faf2e83895271f80a369247fb4eeeae63b0022c25f805e5ed9fa073a581
-  data.tar.gz: f354b078188dfb893c6690a80aa830498bce489e868c132b29317020d73b455528914ce0880f748b8c5f2da2845df61fd2d986b142c58a0d8082b42e62329392
+  metadata.gz: 614ff9e0eaac288fb4a890e3ca0926e720c06fdc68de3ce33d015d1ad477b4172126614c321fb1da1bb6e4c8539ba80c774b8f9a619c7475b0469c9001a0eca2
+  data.tar.gz: e85e9357079e541270b659f0b11c71b3e286099d590aaba4fc90ac1462a2bf916e5e7752fa87d5f6d760598e9a0ea3e66c6e99f55f3085345516e28a17fa4caa

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Unreleased
 
+# 1.24.2
+
+* Workaround two Ruby bugs in `RubyVM::InstructionSequence.compile_file`, that were causing
+  files to be loaded with the old Ruby parser instead of Prism, causing issues with some pattern matching syntax.
+  Ref: https://bugs.ruby-lang.org/issues/22023
+
 # 1.24.1
 
 * Fix encoding of Ruby source files loaded when `BOOTSNAP_READONLY` is set.

data/lib/bootsnap/compile_cache/iseq.rb

@@ -36,19 +36,47 @@ module Bootsnap
           true
         end
 
+        has_ruby_bug_22023 = if defined?(RubyVM::InstructionSequence) && RubyVM::InstructionSequence.respond_to?(:compile_file_prism)
+          begin
+            RubyVM::InstructionSequence.compile_file(File.expand_path("../ruby_bug_22023_canary.rb", __FILE__))
+            false
+          rescue SyntaxError
+            true
+          end
+        end
+
+        if has_ruby_bug_22023 && RUBY_DESCRIPTION.include?("+PRISM")
+          module PatchRubyBug22023
+            def compile_file(path, options = nil)
+              compile_file_prism(path, options)
+            end
+
+            has_ruby_bug_22023_bis = !RubyVM::InstructionSequence.compile_file_prism(
+              File.expand_path("../ruby_bug_22023_canary.rb", __FILE__),
+              {frozen_string_literal: true},
+            ).eval.frozen?
+
+            if has_ruby_bug_22023_bis
+              def compile_file_prism(path, options = nil)
+                compile_prism(::File.read(path), path, path, nil, options)
+              end
+            end
+          end
+          RubyVM::InstructionSequence.singleton_class.prepend(PatchRubyBug22023)
+        end
+
         if has_ruby_bug_18250
           def input_to_storage(_, path)
             iseq = RubyVM::InstructionSequence.compile_file(path, @compile_options)
-
-            begin
-              iseq.to_binary
-            rescue TypeError
-              UNCOMPILABLE # ruby bug #18250
-            end
+            iseq.to_binary
+          rescue TypeError, SyntaxError # Ruby [Bug #18250] & [Bug #22023]
+            UNCOMPILABLE
           end
         else
           def input_to_storage(_, path)
             RubyVM::InstructionSequence.compile_file(path, @compile_options).to_binary
+          rescue SyntaxError # Ruby [Bug #22023]
+            UNCOMPILABLE
           end
         end
 

data/lib/bootsnap/compile_cache/ruby_bug_22023_canary.rb

@@ -0,0 +1,10 @@
+# rubocop:disable Style/FrozenStringLiteralComment
+def foo(bars)
+  case bars
+  in [one, "a" | "b" => two]
+    puts "#{one} - #{two}"
+  end
+end
+
+_ = "test"
+# rubocop:enable Style/FrozenStringLiteralComment

data/lib/bootsnap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bootsnap
-  VERSION = "1.24.1"
+  VERSION = "1.24.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 1.24.2
 platform: ruby
 authors:
 - Burke Libbey
@@ -44,6 +44,7 @@ files:
 - lib/bootsnap/cli/worker_pool.rb
 - lib/bootsnap/compile_cache.rb
 - lib/bootsnap/compile_cache/iseq.rb
+- lib/bootsnap/compile_cache/ruby_bug_22023_canary.rb
 - lib/bootsnap/compile_cache/yaml.rb
 - lib/bootsnap/explicit_require.rb
 - lib/bootsnap/load_path_cache.rb