Merge remote-tracking branch 'official/master' into mmtk

Author: wks

.cirrus.yml

@@ -131,3 +131,4 @@ yjit_task:
   make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
   make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx" TESTOPTS="$RUBY_TESTOPTS"
   make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
+  clippy_script: source $HOME/.cargo/env && cd yjit && cargo clippy --all-targets --all-features

.gdbinit

@@ -1281,7 +1281,7 @@ end
 
 # Details: https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB
 define trace_machine_instructions
-  set logging on
+  set logging enabled
   set height 0
   set width 0
   display/i $pc

.github/workflows/baseruby.yml

@@ -39,6 +39,7 @@ jobs:
 #         - ruby-2.7
           - ruby-3.0
           - ruby-3.1
+          - ruby-3.2
 
     steps:
       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

.github/workflows/bundled_gems.yml

@@ -56,35 +56,7 @@ jobs:
 
       - name: Maintain updated gems list in NEWS
         run: |
-          #!ruby
-          require 'json'
-          news = File.read("NEWS.md")
-          prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
-          prevs = [prev, prev.sub(/\.\d+\z/, '')]
-          %W[bundled].each do |type|
-            last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g|
-              v = g['versions'].values_at(*prevs).compact.first
-              g = g['gem']
-              g = 'RubyGems' if g == 'rubygems'
-              [g, v] if v
-            end.to_h
-            changed = File.foreach("gems/#{type}_gems").filter_map do |l|
-              next if l.start_with?("#")
-              g, v = l.split(" ", 3)
-              [g, v] unless last[g] == v
-            end
-            changed, added = changed.partition {|g, _| last[g]}
-            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\*( +).*\n)*/) do
-              mark = "#{$1} *#{$2}"
-              changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
-            end or next
-            news.sub!(/^\*( +)The following default gems are now bundled gems\.\n+\K(?: \1\*( +).*\n)*/) do
-              mark = "#{$1} *#{$2}"
-              added.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
-            end or next unless added.empty?
-            File.write("NEWS.md", news)
-          end
-        shell: ruby {0}
+          ruby tool/update-NEWS-gemlist.rb bundled
 
       - name: Check diffs
         id: diff

.github/workflows/check_misc.yml

@@ -20,7 +20,7 @@ jobs:
           ! grep -r -n '[^	 -~]' -- *.[chy] include internal win32/*.[ch]
       - name: Check for trailing spaces
         run: |
-          ! git grep -n '[	 ]$' -- '*.rb' '*.[chy]'
+          ! git grep -n '[	 ]$' -- '*.rb' '*.[chy]' '*.rs'
           ! git grep -n '^[	 ][	 ]*$' -- '*.md'
       - name: Check for bash specific substitution in configure.ac
         run: |
@@ -66,30 +66,7 @@ jobs:
 
       - name: Maintain updated gems list in NEWS
         run: |
-          #!ruby
-          require 'json'
-          news = File.read("NEWS.md")
-          prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
-          prevs = [prev, prev.sub(/\.\d+\z/, '')]
-          %W[default].each do |type|
-            last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g|
-              v = g['versions'].values_at(*prevs).compact.first
-              g = g['gem']
-              g = 'RubyGems' if g == 'rubygems'
-              [g, v] if v
-            end.to_h
-            changed = File.foreach("gems/#{type}_gems").filter_map do |l|
-              next if l.start_with?("#")
-              g, v = l.split(" ", 3)
-              [g, v] unless last[g] == v
-            end
-            news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\* .*\n)*/) do
-              mark = "#{$1} * "
-              changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("")
-            end or next
-            File.write("NEWS.md", news)
-          end
-        shell: ruby {0}
+          ruby tool/update-NEWS-gemlist.rb default
 
       - name: Check diffs
         id: diff

.github/workflows/spec_guards.yml

@@ -29,6 +29,7 @@ jobs:
         ruby:
           - ruby-2.7
           - ruby-3.1
+          - ruby-3.2
 
     steps:
       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

.github/workflows/yjit-ubuntu.yml

@@ -40,6 +40,15 @@ jobs:
       # Check that we can build in release mode too
       - run: cargo build --release
         working-directory: yjit
+  lint:
+    name: Rust lint
+    # GitHub Action's image seems to already contain a Rust 1.58.0.
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+      # Check that we don't have linting errors in release mode, too
+      - run: cargo clippy --all-targets --all-features
+        working-directory: yjit
   make:
     strategy:
       fail-fast: false

LEGAL

@@ -748,8 +748,7 @@ mentioned below.
 [ext/psych]
 [test/psych]
 
-  The files under these directories are under the following license, except for
-  ext/psych/yaml.
+  The files under these directories are under the following license.
 
   >>>
     Copyright 2009:: Aaron Patterson, et al.
@@ -772,31 +771,6 @@ mentioned below.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 
-[ext/psych/yaml]
-
-  The files under this directory are under the following license.
-
-  >>>
-    Copyright (c) 2006:: Kirill Simonov
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of
-    this software and associated documentation files (the "Software"), to deal in
-    the Software without restriction, including without limitation the rights to
-    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is furnished to do
-    so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
 [ext/pty/pty.c]
 
   >>>
@@ -979,7 +953,6 @@ mentioned below.
     {MIT License}[rdoc-label:label-MIT+License]
 
 [lib/rubygems/resolver/molinillo]
-[lib/bundler/vendor/molinillo]
 
   molinillo is under the following license.
 
@@ -988,6 +961,15 @@ mentioned below.
 
     {MIT License}[rdoc-label:label-MIT+License]
 
+[lib/bundler/vendor/pub_grub]
+
+  pub_grub is under the following license.
+
+  >>>
+    Copyright (c) 2018 John Hawthorn
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
 [lib/bundler/vendor/connection_pool]
 
   connection_pool is under the following license.

NEWS.md

@@ -21,23 +21,25 @@ Note: We're only listing outstanding class updates.
 
 ## Stdlib updates
 
-*   The following default gems are updated.
+The following default gems are updated.
 
-    * RubyGems 3.5.0.dev
-    * abbrev 0.1.1
-    * bundler 2.5.0.dev
-    * csv 3.2.7
-    * fiddle 1.1.2
-    * optparse 0.4.0.pre.1
-    * stringio 3.0.5
-    * strscan 3.0.6
+* RubyGems 3.5.0.dev
+* abbrev 0.1.1
+* bundler 2.5.0.dev
+* csv 3.2.7
+* fiddle 1.1.2
+* optparse 0.4.0.pre.1
+* stringio 3.0.5
+* strscan 3.0.6
 
-*   The following bundled gems are updated.
+The following bundled gems are updated.
 
-    * minitest 5.17.0
-    * rbs 2.8.3
+* minitest 5.17.0
+* rbs 2.8.3
+* typeprof 0.21.4
 
-See GitHub releases like [GitHub Releases of Logger](https://github.com/ruby/logger/releases) or changelog for details of the default gems or bundled gems.
+See GitHub releases like [Logger](https://github.com/ruby/logger/releases) or
+changelog for details of the default gems or bundled gems.
 
 ## Supported platforms
 

addr2line.c

@@ -1725,10 +1725,6 @@ di_read_cu(DebugInfoReader *reader)
     di_read_debug_abbrev_cu(reader);
     if (di_read_debug_line_cu(reader)) return -1;
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER_BUILD_DATE)
-    /* Though DWARF specifies "the applicable base address defaults to the base
-       address of the compilation unit", but GCC seems to use zero as default */
-#else
     do {
         DIE die;
 
@@ -1772,14 +1768,14 @@ di_read_cu(DebugInfoReader *reader)
                 break;
             case VAL_addr:
                 {
-                    addr_header_t header;
+                    addr_header_t header = {};
                     addr_header_init(reader->obj, &header);
                     reader->current_low_pc = read_addr(&header, reader->current_addr_base, low_pc.as.addr_idx);
                 }
                 break;
         }
     } while (0);
-#endif
+
     return 0;
 }