New upstream version 2.7.1

Author: sorah

ChangeLog

@@ -3,17 +3,10 @@ version: '{build}'
 shallow_clone: true
 platform:
   - x64
-branches:
-  except:
-    - trunk # mirrored from trunk. avoid doubly building on it
 environment:
   ruby_version: "24-%Platform%"
   zlib_version: "1.2.11"
   matrix:
-    # to reduce time for finishing all jobs, run the slowest msys2 build first.
-    - build: msys2
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GEMS_FOR_TEST: "timezone tzinfo"
     - build: vs
       vs: 120
       ssl: OpenSSL
@@ -78,52 +71,6 @@ for:
     # separately execute tests without -j which may crash worker with -j.
     - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
     - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
--
-  matrix:
-    only:
-      - build: msys2
-  install:
-    - ver
-    - chcp
-    - set /a JOBS=%NUMBER_OF_PROCESSORS%
-    - set MSYS_NO_PATHCONV=1
-    - SET MSYSTEM=%Platform:x86=32%
-    - SET MSYSTEM=%MSYSTEM:x=MINGW%
-    - SET MSYS2_ARCH=%Platform:x86=i686%
-    - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64%
-    - set MSYSTEM_PREFIX=/mingw64
-    - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32
-    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
-    - cd ..
-    - mkdir build
-    - mkdir install
-    - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
-    - ruby --version
-  build_script:
-    - pacman -Syd --noconfirm --noprogressbar --needed mingw-w64-x86_64-binutils mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-gcc
-    # when fixed in MSYS2 / Mingw-w64, remove above and use normal code below
-    #- pacman -Sy --noconfirm --noprogressbar --needed mingw-w64-x86_64-toolchain
-    - pacman -S  --noconfirm --noprogressbar --needed mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-libyaml mingw-w64-x86_64-openssl mingw-w64-x86_64-ragel mingw-w64-x86_64-readline mingw-w64-x86_64-zlib
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe
-    - set CXXFLAGS=%CFLAGS%
-    - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048
-    - set LDFLAGS=-pipe
-    - sh -c "autoreconf -fi"
-    - cd ..\build
-    - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST%
-    - mingw32-make %mflags% touch-unicode-files
-    - mingw32-make -j%JOBS% %UPDATE_UNICODE% up incs
-    - mingw32-make -j%JOBS% V=1
-    - mingw32-make DESTDIR=../install install-nodoc
-    - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
-    - ..\install\bin\ruby.exe -v -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
-  test_script:
-    - mingw32-make test
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
-    # separately execute tests without -j which may crash worker with -j.
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
-    - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
 notifications:
   # Using "Webhook" with templated body to skip notification on Pull Request
   - provider: Webhook

appveyor.yml

@@ -3037,6 +3037,7 @@ transcode.$(OBJEXT): {$(VPATH)}assert.h
 transcode.$(OBJEXT): {$(VPATH)}config.h
 transcode.$(OBJEXT): {$(VPATH)}defines.h
 transcode.$(OBJEXT): {$(VPATH)}encoding.h
+transcode.$(OBJEXT): {$(VPATH)}id.h
 transcode.$(OBJEXT): {$(VPATH)}intern.h
 transcode.$(OBJEXT): {$(VPATH)}internal.h
 transcode.$(OBJEXT): {$(VPATH)}missing.h

common.mk

@@ -1096,6 +1096,15 @@ cont_save_thread(rb_context_t *cont, rb_thread_t *th)
     sec->machine.stack_end = NULL;
 }
 
+static void
+cont_init_mjit_cont(rb_context_t *cont)
+{
+    VM_ASSERT(cont->mjit_cont == NULL);
+    if (mjit_enabled) {
+        cont->mjit_cont = mjit_cont_new(&(cont->saved_ec));
+    }
+}
+
 static void
 cont_init(rb_context_t *cont, rb_thread_t *th)
 {
@@ -1105,9 +1114,7 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
     cont->saved_ec.local_storage = NULL;
     cont->saved_ec.local_storage_recursive_hash = Qnil;
     cont->saved_ec.local_storage_recursive_hash_for_trace = Qnil;
-    if (mjit_enabled) {
-        cont->mjit_cont = mjit_cont_new(&cont->saved_ec);
-    }
+    cont_init_mjit_cont(cont);
 }
 
 static rb_context_t *
@@ -1124,6 +1131,14 @@ cont_new(VALUE klass)
     return cont;
 }
 
+void
+rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber)
+{
+    // Currently this function is meant for root_fiber. Others go through cont_new.
+    // XXX: Is this mjit_cont `mjit_cont_free`d?
+    cont_init_mjit_cont(&fiber->cont);
+}
+
 #if 0
 void
 show_vm_stack(const rb_execution_context_t *ec)

cont.c

@@ -379,12 +379,23 @@ converted to an Array:
 
   gather_arguments 1, 2, 3 # prints [1, 2, 3]
 
-The array argument must be the last positional argument, it must appear before
-any keyword arguments.
+The array argument must appear before any keyword arguments.
+
+It is possible to gather arguments at the beginning or in the middle:
+
+  def gather_arguments(first_arg, *middle_arguments, last_arg)
+    p middle_arguments
+  end
+
+  gather_arguments 1, 2, 3, 4 # prints [2, 3]
 
 The array argument will capture a Hash as the last entry if a hash was sent by
 the caller after all positional arguments.
 
+  def gather_arguments(*arguments)
+    p arguments
+  end
+
   gather_arguments 1, a: 2 # prints [1, {:a=>2}]
 
 However, this only occurs if the method does not declare any keyword arguments.

doc/syntax/methods.rdoc

@@ -26,6 +26,7 @@
 
 NORETURN(void rb_raise_jump(VALUE, VALUE));
 void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
+void rb_ec_clear_all_trace_func(const rb_execution_context_t *ec);
 
 static int rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex);
 static int rb_ec_exec_node(rb_execution_context_t *ec, void *n);
@@ -140,7 +141,7 @@ rb_ec_teardown(rb_execution_context_t *ec)
     }
     EC_POP_TAG();
     rb_ec_exec_end_proc(ec);
-    rb_ec_clear_current_thread_trace_func(ec);
+    rb_ec_clear_all_trace_func(ec);
 }
 
 static void

eval.c

@@ -27,5 +27,7 @@
   $cleanfiles << "$(FAILURES:.cpp=.failed)"
   create_makefile("-test-/cxxanyargs") do |mk|
     mk << "FAILURES #{['=', failures].join(' ')}\n"
+    mk << ".IGNORE: $(FAILURES:.cpp=.o)\n" unless $mswin
+    mk
   end
 end

ext/-test-/cxxanyargs/extconf.rb

@@ -73,8 +73,16 @@ set_after_gc_start(VALUE module, VALUE proc)
 		       "__set_after_gc_start_tpval__", "__set_after_gc_start_proc__");
 }
 
+static VALUE
+start_after_gc_exit(VALUE module, VALUE proc)
+{
+    return set_gc_hook(module, proc, RUBY_INTERNAL_EVENT_GC_EXIT,
+                       "__set_after_gc_exit_tpval__", "__set_after_gc_exit_proc__");
+}
+
 void
 Init_gc_hook(VALUE module)
 {
     rb_define_module_function(module, "after_gc_start_hook=", set_after_gc_start, 1);
+    rb_define_module_function(module, "after_gc_exit_hook=", start_after_gc_exit, 1);
 }

ext/-test-/tracepoint/gc_hook.c

@@ -1,4 +1,4 @@
-http://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz \
+https://ftp.osuosl.org/pub/blfs/conglomeration/libffi/libffi-3.2.1.tar.gz \
   md5:83b89587607e3eb65c70d361f13bab43 \
   sha512:980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 \
   #

ext/fiddle/extlibs

@@ -111,6 +111,9 @@ rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *
     int argc = *argcp;
     rawmode_arg_t *optp = NULL;
     VALUE vopts = Qnil;
+#ifdef RB_SCAN_ARGS_PASS_CALLED_KEYWORDS
+    argc = rb_scan_args(argc, argv, "*:", NULL, &vopts);
+#else
     if (argc > min_argc)  {
 	vopts = rb_check_hash_type(argv[argc-1]);
 	if (!NIL_P(vopts)) {
@@ -120,6 +123,7 @@ rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *
 	    if (!vopts) vopts = Qnil;
 	}
     }
+#endif
     rb_check_arity(argc, min_argc, max_argc);
     if (!NIL_P(vopts)) {
 	VALUE vmin = rb_hash_aref(vopts, ID2SYM(id_min));
@@ -188,8 +192,9 @@ set_rawmode(conmode *t, void *arg)
 #endif
 #ifdef ISIG
 	if (r->intr) {
-	    t->c_iflag |= BRKINT|IXON;
+	    t->c_iflag |= BRKINT;
 	    t->c_lflag |= ISIG;
+	    t->c_oflag |= OPOST;
 	}
 #endif
 	(void)r;
@@ -355,9 +360,9 @@ ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter
 
 /*
  * call-seq:
- *   io.raw(min: nil, time: nil) {|io| }
+ *   io.raw(min: nil, time: nil, intr: nil) {|io| }
  *
- * Yields +self+ within raw mode.
+ * Yields +self+ within raw mode, and returns the result of the block.
  *
  *   STDIN.raw(&:gets)
  *
@@ -369,6 +374,9 @@ ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter
  * The parameter +time+ specifies the timeout in _seconds_ with a
  * precision of 1/10 of a second. (default: 0)
  *
+ * If the parameter +intr+ is +true+, enables break, interrupt, quit,
+ * and suspend special characters.
+ *
  * Refer to the manual page of termios for further details.
  *
  * You must require 'io/console' to use this method.
@@ -382,11 +390,11 @@ console_raw(int argc, VALUE *argv, VALUE io)
 
 /*
  * call-seq:
- *   io.raw!(min: nil, time: nil)
+ *   io.raw!(min: nil, time: nil, intr: nil) -> io
  *
- * Enables raw mode.
+ * Enables raw mode, and returns +io+.
  *
- * If the terminal mode needs to be back, use io.raw { ... }.
+ * If the terminal mode needs to be back, use <code>io.raw { ... }</code>.
  *
  * See IO#raw for details on the parameters.
  *
@@ -482,7 +490,7 @@ nogvl_getch(void *p)
 
 /*
  * call-seq:
- *   io.getch(min: nil, time: nil)       -> char
+ *   io.getch(min: nil, time: nil, intr: nil) -> char
  *
  * Reads and returns a character in raw mode.
  *
@@ -1489,7 +1497,7 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *   io.getch(min: nil, time: nil)       -> char
+ *   io.getch(min: nil, time: nil, intr: nil) -> char
  *
  * See IO#getch.
  */