Merge remote-tracking branch 'jemma/size-shape' into size-shape

* jemma/size-shape: (48 commits) Set ivars individually on dups allocated out of different size_pools Fix rb_obj_copy_ivar to use iv_count for src Rename vars in rb_ensure_iv_list_size for clarity Create an rb_shape_get_next without side effects of incrementing max_iv_count on class reuse rb_grow_iv_list use the same ratio for growing iv counts WIP: Transition shapes on capacity changes Ignore manual files only commits [ci skip] sync_default_gems.rb: fold too long subject [ci skip] Update default gems list at dffca50 [ci skip] [ruby/fiddle] Free closures immediately (ruby/fiddle#109) [ruby/fiddle] Add support for linker script on Linux [ruby/fiddle] Fix filenames for glibc SO files on alpha and ia64 (ruby/fiddle#105) [ruby/fiddle] Bump version fiddle: use the old rb_ary_tmp_new() alias [rubygems/rubygems] Bundler: github DSL has used https protocol over git Merge RubyGems/Bundler master [rubygems/rubygems] TestGemSecuritySigner#test_sign: Correct the expectation for new cert. [rubygems/rubygems] TestGemSecurity#test_class_re_sign: Correct signature algorithm. [rubygems/rubygems] Set Subject Key Identifier in test to correspond to the new certificate. ...
tenderlove · Oct 18, 2022 · fee2894 · fee2894
2 parents 7775052 + 1227940
commit fee2894
Show file tree

Hide file tree

Showing 130 changed files with 1,521 additions and 1,100 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -46,7 +46,7 @@ for:
     - git pull -q
     - .\bootstrap-vcpkg.bat
     - cd %APPVEYOR_BUILD_FOLDER%
-    - vcpkg --triplet %Platform%-windows install libffi libyaml readline zlib
+    - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib
     - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
     - SET vcvars
     - '"%vcvars%" %Platform:x64=amd64%'
@@ -118,7 +118,7 @@ notifications:
       {{^isPullRequest}}
         {
           "ci": "AppVeyor CI",
-          "env": "Visual Studio 2013 / 2015",
+          "env": "Visual Studio 2013",
           "url": "{{buildUrl}}",
           "commit": "{{commitId}}",
           "branch": "{{branch}}"

diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml
@@ -6,11 +6,17 @@ on:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,12 +7,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   schedule:
     - cron: '0 12 * * 4'
 

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
@@ -7,12 +7,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/mjit-bindgen.yml b/.github/workflows/mjit-bindgen.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml
@@ -7,12 +7,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

diff --git a/NEWS.md b/NEWS.md
@@ -215,6 +215,7 @@ Note: We're only listing outstanding class updates.
     * date 3.2.3
     * error_highlight 0.4.0
     * etc 1.4.0
+    * fiddle 1.1.1
     * io-console 0.5.11
     * io-nonblock 0.1.1
     * io-wait 0.3.0.pre

diff --git a/dir.c b/dir.c
@@ -2305,7 +2305,7 @@ glob_helper(
 #endif
             break;
           case BRACE:
-            if (!recursive) {
+            if (!recursive || strchr(p->str, '/')) {
                 brace = 1;
             }
             break;

diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
@@ -56,6 +56,8 @@ closure_memsize(const void * ptr)
 const rb_data_type_t closure_data_type = {
     "fiddle/closure",
     {0, dealloc, closure_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 struct callback_args {
@@ -74,7 +76,7 @@ with_gvl_callback(void *ptr)
     VALUE rbargs    = rb_iv_get(self, "@args");
     VALUE ctype     = rb_iv_get(self, "@ctype");
     int argc        = RARRAY_LENINT(rbargs);
-    VALUE params    = rb_ary_hidden_new(argc);
+    VALUE params    = rb_ary_tmp_new(argc);
     VALUE ret;
     VALUE cPointer;
     int i, type;

diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
@@ -58,7 +58,36 @@ def self.last_error= error
   #
   # See Fiddle::Handle.new for more.
   def dlopen library
-    Fiddle::Handle.new library
+    begin
+      Fiddle::Handle.new(library)
+    rescue DLError => error
+      case RUBY_PLATFORM
+      when /linux/
+        case error.message
+        when /\A(\/.+?): (?:invalid ELF header|file too short)/
+          # This may be a linker script:
+          # https://sourceware.org/binutils/docs/ld.html#Scripts
+          path = $1
+        else
+          raise
+        end
+      else
+        raise
+      end
+
+      File.open(path) do |input|
+        input.each_line do |line|
+          case line
+          when /\A\s*(?:INPUT|GROUP)\s*\(\s*([^\s,\)]+)/
+            # TODO: Should we support multiple files?
+            return dlopen($1)
+          end
+        end
+      end
+
+      # Not found
+      raise
+    end
   end
   module_function :dlopen
 

diff --git a/ext/fiddle/lib/fiddle/version.rb b/ext/fiddle/lib/fiddle/version.rb
@@ -1,3 +1,3 @@
 module Fiddle
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end
diff --git a/gc.c b/gc.c
@@ -2936,7 +2936,7 @@ rb_class_instance_allocate_internal(VALUE klass, VALUE flags, bool wb_protected)
 #endif
     }
     else {
-        rb_ensure_iv_list_size(obj, 0, index_tbl_num_entries);
+        rb_ensure_iv_list_size(obj, ROBJECT_NUMIV(obj), index_tbl_num_entries);
     }
 
     return obj;

diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -41,7 +41,6 @@ module Bundler
 
   autoload :Definition,             File.expand_path("bundler/definition", __dir__)
   autoload :Dependency,             File.expand_path("bundler/dependency", __dir__)
-  autoload :DepProxy,               File.expand_path("bundler/dep_proxy", __dir__)
   autoload :Deprecate,              File.expand_path("bundler/deprecate", __dir__)
   autoload :Digest,                 File.expand_path("bundler/digest", __dir__)
   autoload :Dsl,                    File.expand_path("bundler/dsl", __dir__)
-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
         }
         else {
-            rb_ensure_iv_list_size(obj, 0, index_tbl_num_entries);
+            rb_ensure_iv_list_size(obj, ROBJECT_NUMIV(obj), index_tbl_num_entries);
         }
         return obj;
@@ Expand Down @@