github · tenderlove · Mar 14, 2019 · Mar 18, 2019 · Dec 12, 2018 · Mar 18, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -5,3 +5,4 @@ bin/* diff=ruby
 tool/update-deps diff=ruby
 tool/make-snapshot diff=ruby
 tool/format-release diff=ruby
+tool/leaked-globals diff=ruby
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,6 @@ language: c
 
 dist: xenial
 
-osx_image: xcode10.1
-
 git:
   quiet: true
 
@@ -48,7 +46,8 @@ addons:
       - valgrind
       - zlib1g-dev
   homebrew:
-    update: true
+    # `update: true` is disabled because `brew update` hangs often
+    # update: true
     packages:
       - gdbm
       - gmp
@@ -156,12 +155,19 @@ env:
       - GEMS_FOR_TEST=
       - cppflags=-DVM_CHECK_MODE=0x0003
 
-  - &FIBER_USE_sjlj
-    name: FIBER_USE_NATIVE=0
+  - &WITH_COROUTINE_UCONTEXT
+    name: COROUTINE=ucontext
     <<: *linux
     <<: *cron-only
     env:
-      - cppflags=-DFIBER_USE_NATIVE=0
+      - CONFIG_FLAG='--with-coroutine=ucontext'
+
+  - &WITH_COROUTINE_COPY
+    name: COROUTINE=copy
+    <<: *linux
+    <<: *cron-only
+    env:
+      - CONFIG_FLAG='--with-coroutine=copy'
 
   - &TOKEN_THREADED_CODE
     name: TOKEN_THREADED_CODE
@@ -325,15 +331,18 @@ env:
     language: ruby
     rvm: 1.9.3
 
-  - &x86_64-darwin17
-    name: x86_64-darwin17
+  - &x86_64-darwin18
+    name: x86_64-darwin18
+    osx_image: xcode11
     <<: *osx
     env:
       - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/[email protected]:/usr/local/opt/zlib
-      - TEST_ALL_OPTS="--tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx --exclude test_gc_compact"
-      - TEST_ALL_ISOLATED_TESTS="../test/ruby/test_gc_compact.rb"
+      # Adding `-v` because we're not sure which test could hang forever: https://travis-ci.org/ruby/ruby/jobs/564804923
+      - TEST_ALL_OPTS="-v --timeout-scale=2.0 --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
       # Disabling -j3 because it seems to cause a hang on building Ruby: https://travis-ci.org/ruby/ruby/jobs/471021727
       - JOBS=
+      # Reset timestamps early, before updating Homebrew etc.
+      - _=$(touch NEWS && find . -type f -exec touch -r NEWS {} +)
 
   - &dependency
     name: Check dependencies in makefiles
@@ -345,6 +354,17 @@ env:
     before_install:
     install:
     before_script:
+      - |-
+        ruby -e 'new = []
+          Dir.glob("ext/**/extconf.rb") {|ex|
+            unless File.exist?(dep = File.dirname(ex)+"/depend")
+              puts "Adding "+dep
+              File.copy_stream("template/depend.tmpl", dep)
+              new << dep
+            end
+          }
+          exec("git", "add", *new) unless new.empty?'
+      - git diff --cached
       - "> config.status"
       - "> .rbconfig.time"
       - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
@@ -364,7 +384,7 @@ env:
 matrix:
   include:
     # to reduce time for finishing all jobs, run the slowest osx build first.
-    - <<: *x86_64-darwin17
+    - <<: *x86_64-darwin18
     - <<: *x86_64-linux
     - <<: *i686-linux
     - <<: *jemalloc
@@ -374,7 +394,8 @@ matrix:
     - <<: *UBSAN
     - <<: *assertions
     - <<: *VM_CHECK_MODE
-    - <<: *FIBER_USE_sjlj
+    - <<: *WITH_COROUTINE_UCONTEXT
+    - <<: *WITH_COROUTINE_COPY
     - <<: *TOKEN_THREADED_CODE
     - <<: *CALL_THREADED_CODE
     - <<: *NO_THREADED_CODE
@@ -402,6 +423,9 @@ before_script:
   - "> .rbconfig.time"
   - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
   - date; make touch-unicode-files
+  - |-
+    [ ${TRAVIS_OS_NAME} != osx ] ||
+    ls -ltT tool/generic_erb.rb template/unicode_norm_gen.tmpl enc/unicode/data/*/ucd/.unicode-tables.time
   - date; make -s $JOBS $UPDATE_UNICODE up
   - date; make -s $JOBS srcs
   - rm -f config.status Makefile rbconfig.rb .rbconfig.time
@@ -456,11 +480,7 @@ before_script:
 
 script:
   - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
-  - travis_wait 40 $SETARCH make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}" RUBYOPT="-w"
-  - |-
-    if [ -n "${TEST_ALL_ISOLATED_TESTS}" ]; then
-      $SETARCH make -s test-all -o exts TESTS="$TEST_ALL_ISOLATED_TESTS" RUBYOPT="-w"
-    fi
+  - $SETARCH make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}" RUBYOPT="-w"
   - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
   - $SETARCH make -s leaked-globals
 

diff --git a/Makefile.in b/Makefile.in
diff --git a/NEWS b/NEWS
@@ -60,6 +60,8 @@ sufficient information, see the ChangeLog file or Redmine
       .bar(1, 2)
       .display
 
+* The flip-flop syntax deprecation is reverted. [Feature #5400]
+
 === Core classes updates (outstanding ones only)
 
 Complex::
@@ -75,7 +77,7 @@ Encoding::
 
 Enumerable::
 
-  New method::
+  New methods::
 
     * Added Enumerable#filter_map.  [Feature #15323]
 
@@ -147,12 +149,27 @@ Regexp / String::
     * Update Unicode version to 12.1.0, adding support for
       U+32FF SQUARE ERA NAME REIWA.  [Feature #15195]
 
+RubyVM::
+
+  Removed method::
+
+    * RubyVM.resolve_feature_path moved to
+      $LOAD_PATH.resolve_feature_path.  [Feature #15903] [Feature #15230]
+
 Time::
 
+  New methods::
+
     * Added Time#ceil method.  [Feature #15772]
 
     * Added Time#floor method.  [Feature #15653]
 
+$LOAD_PATH::
+
+  New method::
+
+    * Added $LOAD_PATH.resolve_feature_path.  [Feature #15903] [Feature #15230]
+
 === Stdlib updates (outstanding ones only)
 
 Bundler::
@@ -188,14 +205,38 @@ IRB::
   * Introduce syntax highlight inspired by pry.gem to Binding#irb source lines,
     REPL input, and inspect output of some core-class objects.
 
+  * Introduce multiline mode by Reline.
+
+  * Show documents when completion.
+
+  * Enable auto indent and save/load history by default.
+
 Net::IMAP::
 
   * Add Server Name Indication (SNI) support.  [Feature #15594]
 
+open-uri::
+
+  * Warn open-uri's "open" method at Kernel.
+    Use URI.open instead.  [Misc #15893]
+
+  * The default charset of text/* media type is UTF-8 instead of ISO-8859-1.
+    [Bug #15933]
+
+Pathname::
+
+  * Delegates 3 arguments from Pathname.glob to Dir.glob to
+    accept base: keyword.
+
 Racc::
 
   * Merge 1.4.15 from upstream repository and added cli of racc.
 
+Reline::
+
+  * New stdlib that is compatible with readline stdlib by pure Ruby and also
+    has a multiline mode.
+
 RSS::
 
   * Upgrade to RSS 0.2.8.
@@ -218,6 +259,19 @@ profile.rb, Profiler__::
 
 === Implementation improvements
 
+Fiber::
+
+  * Allow selecting different coroutine implementation by using
+    `--with-coroutine=`, e.g.
+
+         ./confgure --with-coroutine=ucontext
+         ./confgure --with-coroutine=copy
+
+  * Replace previous stack cache with fiber pool cache. The fiber pool
+    allocates many stacks in a single memory region. Stack allocation
+    becomes O(log N) and fiber creation is amortized O(1). Around 10x
+    performance improvement was measured in micro-benchmarks.
+
 Thread::
 
   * VM stack memory allocation is now combined with native thread stack,

diff --git a/addr2line.c b/addr2line.c
@@ -187,7 +187,7 @@ struct debug_section_definition {
 };
 
 /* Avoid consuming stack as this module may be used from signal handler */
-static char binary_filename[PATH_MAX];
+static char binary_filename[PATH_MAX + 1];
 
 static unsigned long
 uleb128(char **p)
@@ -432,7 +432,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    /*basic_block = 1; */
 	    break;
 	case DW_LNS_const_add_pc:
-	    a = ((255 - header.opcode_base) / header.line_range) *
+	    a = ((255UL - header.opcode_base) / header.line_range) *
 		header.minimum_instruction_length;
 	    addr += a;
 	    break;
@@ -2050,6 +2050,7 @@ main_exe_path(void)
 {
 # define PROC_SELF_EXE "/proc/self/exe"
     ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
+    if (len < 0) return 0;
     binary_filename[len] = 0;
     return len;
 }

diff --git a/appveyor.yml b/appveyor.yml
@@ -69,9 +69,9 @@ for:
     - set /a JOBS=%NUMBER_OF_PROCESSORS%
     - nmake -l "TESTOPTS=-v -q" btest
     - nmake -l "TESTOPTS=-v -q" test-basic
-    - nmake -l "TESTOPTS=-q --timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca --exclude test_gc_compact" test-all
+    - nmake -l "TESTOPTS=-q --timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
     # 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 ../test/ruby/test_gc_compact.rb"
+    - 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:
@@ -116,9 +116,9 @@ for:
     - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
   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 --exclude test_gc_compact"
+    - 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 ../ruby/test/ruby/test_gc_compact.rb"
+    - 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