bootsnap 1.24.1 → 1.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86fd14b9f3a5920de24b3faf51c01e36ee19b20fc810ee6780c2ba8447871db9
-  data.tar.gz: 4df2ffc0617e1957f264e7fb72002cec56ffb8bfe6f84534343c1b852c37e5e4
+  metadata.gz: 31d64e50bd32368c8dffe927b63fa6e62243b697a2606ca3e2330c4694ec816b
+  data.tar.gz: 5dfc374040409d1d20e893abc6a8c6052de02cf560c15e7678a5db2084bd722c
 SHA512:
-  metadata.gz: 32879429b4f7473a5ed1ea6e32799a3d45d2203a46e867282d0e503396b40acce0a69faf2e83895271f80a369247fb4eeeae63b0022c25f805e5ed9fa073a581
-  data.tar.gz: f354b078188dfb893c6690a80aa830498bce489e868c132b29317020d73b455528914ce0880f748b8c5f2da2845df61fd2d986b142c58a0d8082b42e62329392
+  metadata.gz: ff9e6b5b2c47d0337fa8d46c487fd6881bc567f5ae01a17f85aa3821df9b7f8416283764f8309de6207d94eb00e6cd6ee845a1307dd601659e4d26cd6abbc7ea
+  data.tar.gz: e34adc7c5162da87d94358a99a5990d0dfbc6497fb141e7407614e181328e1091bd708fac0aa96e6bce8731283a367db6a5aa6e8a2afe3b848b2d0f6b73e3ba4

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Unreleased
 
+# 1.24.3
+
+* Fix the `1.24.2` workaround to parse Ruby files with UTF-8 even when the `LANG` environment variable
+  is unset or set to `C`.
+
+# 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, encoding: Encoding::UTF_8), 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.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 1.24.3
 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