Shopify
diff --git a/‎.github/workflows/compilers.yml‎
Lines changed: 26 additions & 25 deletions b/‎.github/workflows/compilers.yml‎
Lines changed: 26 additions & 25 deletions
diff --git a/‎.github/workflows/windows.yml‎
Lines changed: 22 additions & 4 deletions b/‎.github/workflows/windows.yml‎
Lines changed: 22 additions & 4 deletions
diff --git a/‎LEGAL‎
Lines changed: 0 additions & 3 deletions b/‎LEGAL‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎array.c‎
Lines changed: 1 addition & 1 deletion b/‎array.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎ast.c‎
Lines changed: 14 additions & 0 deletions b/‎ast.c‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎class.c‎
Lines changed: 3 additions & 1 deletion b/‎class.c‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎common.mk‎
Lines changed: 1 addition & 0 deletions b/‎common.mk‎
Lines changed: 1 addition & 0 deletions
@@ -6,7 +6,7 @@ on: [push, pull_request]
 # environment variables (plus the "echo ::set-env" hack) is to reroute that
 # restriction.
 env:
-  default_cc: clang-11
+  default_cc: clang-13
   append_cc: ''
   crosshost: ''
 
@@ -47,33 +47,34 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { key: default_cc, name: gcc-10,    value: gcc-10 }
-#         - { key: default_cc, name: gcc-9,     value: gcc-9 }
-#         - { key: default_cc, name: gcc-8,     value: gcc-8 }
-#         - { key: default_cc, name: gcc-7,     value: gcc-7 }
-#         - { key: default_cc, name: gcc-6,     value: gcc-6 }
-#         - { key: default_cc, name: gcc-5,     value: gcc-5 }
-          - { key: default_cc, name: gcc-4.8,   value: gcc-4.8 }
-          - { key: default_cc, name: clang-13,  value: clang-13 }
-#         - { key: default_cc, name: clang-12,  value: clang-12 }
-#         - { key: default_cc, name: clang-11,  value: clang-11 }
-#         - { key: default_cc, name: clang-10,  value: clang-10 }
-#         - { key: default_cc, name: clang-9,   value: clang-9 }
-#         - { key: default_cc, name: clang-8,   value: clang-8 }
-#         - { key: default_cc, name: clang-7,   value: clang-7 }
-#         - { key: default_cc, name: clang-6.0, value: clang-6.0 }
-#         - { key: default_cc, name: clang-5.0, value: clang-5.0 }
-#         - { key: default_cc, name: clang-4.0, value: clang-4.0 }
-          - { key: default_cc, name: clang-3.9, value: clang-3.9 }
-
-          - { key: crosshost, name: aarch64-linux-gnu,     value: aarch64-linux-gnu }
+          - { key: default_cc, name: gcc-11,    value: gcc-11,    container: gcc-11 }
+          - { key: default_cc, name: gcc-10,    value: gcc-10,    container: gcc-10 }
+          - { key: default_cc, name: gcc-9,     value: gcc-9,     container: gcc-9 }
+          - { key: default_cc, name: gcc-8,     value: gcc-8,     container: gcc-8 }
+          - { key: default_cc, name: gcc-7,     value: gcc-7,     container: gcc-7 }
+          - { key: default_cc, name: gcc-6,     value: gcc-6,     container: gcc-6 }
+          - { key: default_cc, name: gcc-5,     value: gcc-5,     container: gcc-5 }
+          - { key: default_cc, name: gcc-4.8,   value: gcc-4.8,   container: gcc-4.8 }
+          - { key: default_cc, name: clang-13,  value: clang-13,  container: clang-13 }
+          - { key: default_cc, name: clang-12,  value: clang-12,  container: clang-12 }
+          - { key: default_cc, name: clang-11,  value: clang-11,  container: clang-11 }
+          - { key: default_cc, name: clang-10,  value: clang-10,  container: clang-10 }
+          - { key: default_cc, name: clang-9,   value: clang-9,   container: clang-9 }
+          - { key: default_cc, name: clang-8,   value: clang-8,   container: clang-8 }
+          - { key: default_cc, name: clang-7,   value: clang-7,   container: clang-7 }
+          - { key: default_cc, name: clang-6.0, value: clang-6.0, container: clang-6.0 }
+          - { key: default_cc, name: clang-5.0, value: clang-5.0, container: clang-5.0 }
+          - { key: default_cc, name: clang-4.0, value: clang-4.0, container: clang-4.0 }
+          - { key: default_cc, name: clang-3.9, value: clang-3.9, container: clang-3.9 }
+
+          - { key: crosshost, name: aarch64-linux-gnu,     value: aarch64-linux-gnu, container: crossbuild-essential-arm64 }
 #         - { key: crosshost, name: arm-linux-gnueabi,     value: arm-linux-gnueabi }
 #         - { key: crosshost, name: arm-linux-gnueabihf,   value: arm-linux-gnueabihf }
 #         - { key: crosshost, name: i686-w64-mingw32,      value: i686-w64-mingw32 }
 #         - { key: crosshost, name: powerpc-linux-gnu,     value: powerpc-linux-gnu }
-          - { key: crosshost, name: powerpc64le-linux-gnu, value: powerpc64le-linux-gnu }
-          - { key: crosshost, name: s390x-linux-gnu,       value: s390x-linux-gnu }
-          - { key: crosshost, name: x86_64-w64-mingw32,    value: x86_64-w64-mingw32 }
+          - { key: crosshost, name: powerpc64le-linux-gnu, value: powerpc64le-linux-gnu, container: crossbuild-essential-ppc64el }
+          - { key: crosshost, name: s390x-linux-gnu,       value: s390x-linux-gnu, container: crossbuild-essential-s390x }
+          - { key: crosshost, name: x86_64-w64-mingw32,    value: x86_64-w64-mingw32, container: mingw-w64 }
 
           - { key: append_cc, name: c99,   value: '-std=c99   -Werror=pedantic -pedantic-errors' }
 #         - { key: append_cc, name: c11,   value: '-std=c11   -Werror=pedantic -pedantic-errors' }
@@ -156,7 +157,7 @@ jobs:
 
     name: ${{ matrix.entry.name }}
     runs-on: ubuntu-latest
-    container: ghcr.io/ruby/ruby-ci-image:latest
+    container: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || 'clang-13' }}
     steps:
       - run: mkdir build
         working-directory:
 
@@ -4,7 +4,7 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: [test]
+        test_task: [check] # to make job names consistent
         os: [windows-2019]
         vs: [2019]
       fail-fast: false
@@ -35,7 +35,11 @@ jobs:
             ${{ runner.os }}-chocolatey-
       - name: Install libraries with chocolatey
         run: |
-          choco install --no-progress openssl winflexbison3
+          # Using Choco-Install for retries, but it doesn't detect failures properly
+          # if you pass multiple package names in a single command.
+          Choco-Install -PackageName openssl
+          Choco-Install -PackageName winflexbison3
+        shell: pwsh
       - name: git config
         run: |
           git config --global core.autocrlf false
@@ -58,10 +62,24 @@ jobs:
           nmake extract-extlibs
           nmake
       - name: nmake test
-        timeout-minutes: 30
+        timeout-minutes: 5
         run: |
           call "%VCVARS%"
-          nmake ${{ matrix.test_task }}
+          nmake test
+      - name: nmake test-all
+        timeout-minutes: 60
+        run: |
+          call "%VCVARS%"
+          # %TEMP% is inconsistent with %TMP% and test-all expects they are consistent.
+          # https://github.com/actions/virtual-environments/issues/712#issuecomment-613004302
+          set TMP=%USERPROFILE%\AppData\Local\Temp
+          set TEMP=%USERPROFILE%\AppData\Local\Temp
+          nmake test-all
+      - name: nmake test-spec
+        timeout-minutes: 10
+        run: |
+          call "%VCVARS%"
+          nmake test-spec
       - uses: k0kubun/[email protected]
         with:
           payload: |
 
@@ -531,7 +531,6 @@ mentioned below.
 [include/ruby/st.h]
 [missing/acosh.c]
 [missing/alloca.c]
-[missing/dup2.c]
 [missing/erf.c]
 [missing/finite.c]
 [missing/hypot.c]
@@ -934,9 +933,7 @@ mentioned below.
 
 [lib/bundler]
 [lib/bundler.rb]
-[lib/bundler.gemspec]
 [spec/bundler]
-[man/bundle-*,gemfile.*]
 
   Bundler is under the following license.
 
 
@@ -5737,7 +5737,7 @@ ary_max_opt_string(VALUE ary, long i, VALUE vmax)
  *  With an argument \Integer +n+ and no block, returns a new \Array with at most +n+ elements,
  *  in descending order per method <tt><=></tt>:
  *    [0, 1, 2, 3].max(3) # => [3, 2, 1]
- *    [0, 1, 2, 3].max(6) # => [3, 2, 1]
+ *    [0, 1, 2, 3].max(6) # => [3, 2, 1, 0]
  *
  *  When a block is given, the block must return an \Integer.
  *
 
@@ -245,6 +245,17 @@ ast_node_type(rb_execution_context_t *ec, VALUE self)
     return rb_sym_intern_ascii_cstr(node_type_to_str(data->node));
 }
 
+#ifdef EXPERIMENTAL_ISEQ_NODE_ID
+static VALUE
+ast_node_node_id(VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2FIX(nd_node_id(data->node));
+}
+#endif
+
 #define NEW_CHILD(ast, node) node ? ast_new_internal(ast, node) : Qnil
 
 static VALUE
@@ -695,4 +706,7 @@ Init_ast(void)
     rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree");
     rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject);
     rb_undef_alloc_func(rb_cNode);
+#ifdef EXPERIMENTAL_ISEQ_NODE_ID
+    rb_define_method(rb_cNode, "node_id", ast_node_node_id, 0);
+#endif
 }
@@ -1181,10 +1181,12 @@ cache_clear_refined_method(ID key, VALUE value, void *data)
 {
     rb_method_entry_t *me = (rb_method_entry_t *) value;
 
-    if (me->def->type == VM_METHOD_TYPE_REFINED) {
+    if (me->def->type == VM_METHOD_TYPE_REFINED && me->def->body.refined.orig_me) {
         VALUE klass = (VALUE)data;
         rb_clear_method_cache(klass, me->called_id);
     }
+    // Refined method entries without an orig_me is going to stay in the method
+    // table of klass, like before the move, so no need to clear the cache.
 
     return ID_TABLE_CONTINUE;
 }
 
@@ -2818,6 +2818,7 @@ compile.$(OBJEXT): $(top_srcdir)/internal/hash.h
 compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 compile.$(OBJEXT): $(top_srcdir)/internal/numeric.h
 compile.$(OBJEXT): $(top_srcdir)/internal/object.h
+compile.$(OBJEXT): $(top_srcdir)/internal/rational.h
 compile.$(OBJEXT): $(top_srcdir)/internal/re.h
 compile.$(OBJEXT): $(top_srcdir)/internal/serial.h
 compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
Original file line number	Diff line number	Diff line change
`@@ -5737,7 +5737,7 @@ ary_max_opt_string(VALUE ary, long i, VALUE vmax)`
`5737`	`5737`	`* With an argument \Integer +n+ and no block, returns a new \Array with at most +n+ elements,`
`5738`	`5738`	`* in descending order per method <tt><=></tt>:`
`5739`	`5739`	`* [0, 1, 2, 3].max(3) # => [3, 2, 1]`
`5740`		`- * [0, 1, 2, 3].max(6) # => [3, 2, 1]`
	`5740`	`+ * [0, 1, 2, 3].max(6) # => [3, 2, 1, 0]`
`5741`	`5741`	`*`
`5742`	`5742`	`* When a block is given, the block must return an \Integer.`
`5743`	`5743`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1181,10 +1181,12 @@ cache_clear_refined_method(ID key, VALUE value, void *data)`
`1181`	`1181`	`{`
`1182`	`1182`	`rb_method_entry_t me = (rb_method_entry_t ) value;`
`1183`	`1183`
`1184`		`- if (me->def->type == VM_METHOD_TYPE_REFINED) {`
	`1184`	`+ if (me->def->type == VM_METHOD_TYPE_REFINED && me->def->body.refined.orig_me) {`
`1185`	`1185`	`VALUE klass = (VALUE)data;`
`1186`	`1186`	`rb_clear_method_cache(klass, me->called_id);`
`1187`	`1187`	`}`
	`1188`	`+ // Refined method entries without an orig_me is going to stay in the method`
	`1189`	`+ // table of klass, like before the move, so no need to clear the cache.`
`1188`	`1190`
`1189`	`1191`	`return ID_TABLE_CONTINUE;`
`1190`	`1192`	`}`