jruby · Mar 7, 2016 · Mar 7, 2016 · Mar 7, 2016
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -2066,65 +2066,37 @@ public static IRubyObject gsub(ThreadContext context, IRubyObject recv, IRubyObj
     public static class LoopMethods {
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject gsub(ThreadContext context, IRubyObject recv, IRubyObject arg0, Block block) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.gsub(context, arg0, block));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).gsub(context, arg0, block));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject gsub(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1, Block block) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.gsub(context, arg0, arg1, block));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).gsub(context, arg0, arg1, block));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject sub(ThreadContext context, IRubyObject recv, IRubyObject arg0, Block block) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.sub(context, arg0, block));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).sub(context, arg0, block));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject sub(ThreadContext context, IRubyObject recv, IRubyObject arg0, IRubyObject arg1, Block block) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.sub(context, arg0, arg1, block));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).sub(context, arg0, arg1, block));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject chop(ThreadContext context, IRubyObject recv) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.chop(context));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).chop(context));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject chomp(ThreadContext context, IRubyObject recv) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.chomp(context));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).chomp(context));
         }
 
         @JRubyMethod(module = true, visibility = PRIVATE, reads = LASTLINE, writes = LASTLINE)
         public static IRubyObject chomp(ThreadContext context, IRubyObject recv, IRubyObject arg0) {
-            RubyString str = getLastlineString(context, context.runtime);
-
-            context.setLastLine(str.chomp(context, arg0));
-
-            return str;
+            return context.setLastLine(getLastlineString(context, context.runtime).chomp(context, arg0));
         }
     }
 

diff --git a/core/src/main/ruby/jruby/kernel/signal.rb b/core/src/main/ruby/jruby/kernel/signal.rb
@@ -10,14 +10,15 @@ def trap(sig, cmd = nil, &block)
     oldhandler, installed = if block
       raise SecurityError.new("Insecure: tainted signal trap") if block.tainted?
       Signal::__jtrap_kernel(block, sig)
-    elsif cmd
+    else
       raise SecurityError.new("Insecure: tainted signal trap") if cmd.tainted?
+      cmd = cmd.to_s if Symbol === cmd
       case cmd
       when Proc
         Signal::__jtrap_kernel(cmd, sig)
       when 'EXIT'
         Signal::__jtrap_kernel(proc{exit}, sig)
-      when 'SIG_IGN', 'IGNORE'
+      when NilClass, 'SIG_IGN', 'IGNORE'
         Signal::__jtrap_restore_kernel(sig)
       when 'SIG_DFL', 'DEFAULT'
         Signal::__jtrap_platform_kernel(sig)

diff --git a/spec/tags/ruby/core/argf/bytes_tags.txt b/spec/tags/ruby/core/argf/bytes_tags.txt
diff --git a/spec/tags/ruby/core/argf/chars_tags.txt b/spec/tags/ruby/core/argf/chars_tags.txt
diff --git a/spec/tags/ruby/core/argf/close_tags.txt b/spec/tags/ruby/core/argf/close_tags.txt
@@ -1,4 +1,2 @@
-fails:ARGF.close closes the current open stream
-fails:ARGF.close returns self
 fails:ARGF.close raises an IOError if called on a closed stream
 fails:ARGF.close does not close STDIN
diff --git a/spec/tags/ruby/core/argf/closed_tags.txt b/spec/tags/ruby/core/argf/closed_tags.txt
diff --git a/spec/tags/ruby/core/argf/each_byte_tags.txt b/spec/tags/ruby/core/argf/each_byte_tags.txt
diff --git a/spec/tags/ruby/core/argf/each_char_tags.txt b/spec/tags/ruby/core/argf/each_char_tags.txt
diff --git a/spec/tags/ruby/core/argf/each_line_tags.txt b/spec/tags/ruby/core/argf/each_line_tags.txt
diff --git a/spec/tags/ruby/core/argf/each_tags.txt b/spec/tags/ruby/core/argf/each_tags.txt
diff --git a/spec/tags/ruby/core/argf/eof_tags.txt b/spec/tags/ruby/core/argf/eof_tags.txt
diff --git a/spec/tags/ruby/core/argf/file_tags.txt b/spec/tags/ruby/core/argf/file_tags.txt
diff --git a/spec/tags/ruby/core/argf/filename_tags.txt b/spec/tags/ruby/core/argf/filename_tags.txt
@@ -1,2 +1 @@
-fails:ARGF.filename returns the current file name on each file
 fails:ARGF.filename sets the $FILENAME global variable with the current file name on each file
diff --git a/spec/tags/ruby/core/argf/fileno_tags.txt b/spec/tags/ruby/core/argf/fileno_tags.txt
diff --git a/spec/tags/ruby/core/argf/getc_tags.txt b/spec/tags/ruby/core/argf/getc_tags.txt
diff --git a/spec/tags/ruby/core/argf/gets_tags.txt b/spec/tags/ruby/core/argf/gets_tags.txt
@@ -1,7 +1 @@
-fails:ARGF.gets reads one line of a file
-fails:ARGF.gets reads all lines of a file
-fails:ARGF.gets reads all lines of two files
-fails:ARGF.gets sets $_ global variable with each line read
-fails:ARGF.gets returns nil when reaching end of files
-fails:ARGF.gets reads the contents of the file with default encoding
 slow:ARGF.gets reads all lines of stdin
diff --git a/spec/tags/ruby/core/argf/lines_tags.txt b/spec/tags/ruby/core/argf/lines_tags.txt
@@ -1,3 +1 @@
 fails:ARGF.lines with a separator yields each separated section of all streams
-fails:ARGF.lines reads each line of files
-fails:ARGF.lines returns self when passed a block
diff --git a/spec/tags/ruby/core/argf/path_tags.txt b/spec/tags/ruby/core/argf/path_tags.txt
@@ -1,2 +1 @@
-fails:ARGF.path returns the current file name on each file
 fails:ARGF.path sets the $FILENAME global variable with the current file name on each file
diff --git a/spec/tags/ruby/core/argf/pos_tags.txt b/spec/tags/ruby/core/argf/pos_tags.txt
diff --git a/spec/tags/ruby/core/argf/read_tags.txt b/spec/tags/ruby/core/argf/read_tags.txt
@@ -1,15 +1,3 @@
-fails:ARGF.read reads the contents of a file
-fails:ARGF.read treats first nil argument as no length limit
-fails:ARGF.read treats second nil argument as no output buffer
-fails:ARGF.read treats second argument as an output buffer
-fails:ARGF.read reads a number of bytes from the first file
-fails:ARGF.read reads from a single file consecutively
-fails:ARGF.read reads the contents of two files
-fails:ARGF.read reads the contents of one file and some characters from the second
-fails:ARGF.read reads across two files consecutively
-fails:ARGF.read reads the contents of the same file twice
-fails:ARGF.read reads the contents of a special device file
-fails:ARGF.read reads the contents of the file with default encoding
 slow:ARGF.read reads the contents of stdin
 slow:ARGF.read reads a number of bytes from stdin
 slow:ARGF.read reads the contents of one file and stdin
diff --git a/spec/tags/ruby/core/argf/readchar_tags.txt b/spec/tags/ruby/core/argf/readchar_tags.txt
diff --git a/spec/tags/ruby/core/argf/readline_tags.txt b/spec/tags/ruby/core/argf/readline_tags.txt
diff --git a/spec/tags/ruby/core/argf/readlines_tags.txt b/spec/tags/ruby/core/argf/readlines_tags.txt
diff --git a/spec/tags/ruby/core/argf/rewind_tags.txt b/spec/tags/ruby/core/argf/rewind_tags.txt
@@ -1,3 +1 @@
-fails:ARGF.rewind goes back to beginning of current file
 fails:ARGF.rewind resets ARGF.lineno to 0
-fails:ARGF.rewind raises an ArgumentError when end of stream reached
diff --git a/spec/tags/ruby/core/argf/seek_tags.txt b/spec/tags/ruby/core/argf/seek_tags.txt
diff --git a/spec/tags/ruby/core/argf/set_encoding_tags.txt b/spec/tags/ruby/core/argf/set_encoding_tags.txt
diff --git a/spec/tags/ruby/core/argf/skip_tags.txt b/spec/tags/ruby/core/argf/skip_tags.txt
diff --git a/spec/tags/ruby/core/argf/tell_tags.txt b/spec/tags/ruby/core/argf/tell_tags.txt
diff --git a/spec/tags/ruby/core/argf/to_a_tags.txt b/spec/tags/ruby/core/argf/to_a_tags.txt
diff --git a/spec/tags/ruby/core/argf/to_i_tags.txt b/spec/tags/ruby/core/argf/to_i_tags.txt
diff --git a/spec/tags/ruby/core/argf/to_io_tags.txt b/spec/tags/ruby/core/argf/to_io_tags.txt
diff --git a/spec/tags/ruby/core/array/partition_tags.txt b/spec/tags/ruby/core/array/partition_tags.txt
diff --git a/spec/tags/ruby/core/array/select_tags.txt b/spec/tags/ruby/core/array/select_tags.txt
diff --git a/spec/tags/ruby/core/bignum/divide_tags.txt b/spec/tags/ruby/core/bignum/divide_tags.txt
diff --git a/spec/tags/ruby/core/complex/coerce_tags.txt b/spec/tags/ruby/core/complex/coerce_tags.txt
diff --git a/spec/tags/ruby/core/complex/eql_tags.txt b/spec/tags/ruby/core/complex/eql_tags.txt
diff --git a/spec/tags/ruby/core/complex/exponent_tags.txt b/spec/tags/ruby/core/complex/exponent_tags.txt
diff --git a/spec/tags/ruby/core/complex/fdiv_tags.txt b/spec/tags/ruby/core/complex/fdiv_tags.txt
diff --git a/spec/tags/ruby/core/complex/inspect_tags.txt b/spec/tags/ruby/core/complex/inspect_tags.txt
diff --git a/spec/tags/ruby/core/complex/integer_tags.txt b/spec/tags/ruby/core/complex/integer_tags.txt
diff --git a/spec/tags/ruby/core/complex/real_tags.txt b/spec/tags/ruby/core/complex/real_tags.txt
diff --git a/spec/tags/ruby/core/dir/glob_tags.txt b/spec/tags/ruby/core/dir/glob_tags.txt
@@ -1,4 +1,3 @@
 fails(JRUBY-5667):Dir.glob splits the string on \0 if there is only one string given
 fails:Dir.glob raises an Encoding::CompatibilityError if the argument encoding is not compatible with US-ASCII
-fails:Dir.glob matches nothing when given an empty list of paths
 fails:Dir.glob splits the string on \0 if there is only one string given
diff --git a/spec/tags/ruby/core/enumerable/slice_when_tags.txt b/spec/tags/ruby/core/enumerable/slice_when_tags.txt
@@ -1,4 +1,2 @@
-fails:Enumerable#slice_when when given a block returns an enumerator
 fails:Enumerable#slice_when when given a block splits chunks between adjacent elements i and j where the block returns true
 fails:Enumerable#slice_when when given a block calls the block for length of the receiver enumerable minus one times
-fails:Enumerable#slice_when when not given a block raises an ArgumentError
diff --git a/spec/tags/ruby/core/exception/name_tags.txt b/spec/tags/ruby/core/exception/name_tags.txt
@@ -1,3 +1,2 @@
-fails:NameError#name returns a class variable name as a symbol
 fails:NameError#name always returns a symbol when a NameError is raised from #instance_variable_get
 fails:NameError#name always returns a symbol when a NameError is raised from #class_variable_get
diff --git a/spec/tags/ruby/core/exception/result_tags.txt b/spec/tags/ruby/core/exception/result_tags.txt
diff --git a/spec/tags/ruby/core/fixnum/divide_tags.txt b/spec/tags/ruby/core/fixnum/divide_tags.txt
diff --git a/spec/tags/ruby/core/hash/compare_by_identity_tags.txt b/spec/tags/ruby/core/hash/compare_by_identity_tags.txt
diff --git a/spec/tags/ruby/core/integer/pred_tags.txt b/spec/tags/ruby/core/integer/pred_tags.txt
diff --git a/spec/tags/ruby/core/integer/rationalize_tags.txt b/spec/tags/ruby/core/integer/rationalize_tags.txt
diff --git a/spec/tags/ruby/core/integer/round_tags.txt b/spec/tags/ruby/core/integer/round_tags.txt
diff --git a/spec/tags/ruby/core/integer/to_r_tags.txt b/spec/tags/ruby/core/integer/to_r_tags.txt
diff --git a/spec/tags/ruby/core/io/popen_tags.txt b/spec/tags/ruby/core/io/popen_tags.txt
@@ -2,5 +2,3 @@ unstable(JRUBY-4171,linux,intermittent failure):IO.popen writes to a write-only
 fails:IO.popen starts returns a forked process if the command is -
 fails:IO.popen with a leading Array argument accepts a trailing Hash of Process.exec options
 fails:IO.popen with a leading Array argument accepts an IO mode argument following the Array
-fails:IO.popen with a leading ENV Hash accepts a single String command with a trailing Hash of Process.exec options, and an IO mode
-fails:IO.popen with a leading ENV Hash accepts an Array command with a separate trailing Hash of Process.exec options, and an IO mode
diff --git a/spec/tags/ruby/core/io/write_tags.txt b/spec/tags/ruby/core/io/write_tags.txt
diff --git a/spec/tags/ruby/core/kernel/Complex_tags.txt b/spec/tags/ruby/core/kernel/Complex_tags.txt
@@ -1,2 +1 @@
 fails:Kernel.Complex() when passed a single non-Numeric coerces the passed argument using #to_c
-fails:Kernel.Complex() when passed [Integer] returns a new Complex number with 0 as the imaginary component
diff --git a/spec/tags/ruby/core/kernel/chomp_tags.txt b/spec/tags/ruby/core/kernel/chomp_tags.txt
diff --git a/spec/tags/ruby/core/kernel/chop_tags.txt b/spec/tags/ruby/core/kernel/chop_tags.txt
diff --git a/spec/tags/ruby/core/kernel/eval_tags.txt b/spec/tags/ruby/core/kernel/eval_tags.txt
@@ -1,4 +1 @@
-fails:Kernel#eval allows a binding to be captured inside an eval
 fails:Kernel#eval raises a LocalJumpError if there is no lambda-style closure in the chain
-fails:Kernel#eval unwinds through a Proc-style closure and returns from a lambda-style closure in the closure chain
-fails:Kernel#eval returns from the scope calling #eval when evaluating 'return'
diff --git a/spec/tags/ruby/core/kernel/frozen_tags.txt b/spec/tags/ruby/core/kernel/frozen_tags.txt
diff --git a/spec/tags/ruby/core/kernel/inspect_tags.txt b/spec/tags/ruby/core/kernel/inspect_tags.txt
diff --git a/spec/tags/ruby/core/kernel/instance_variables_tags.txt b/spec/tags/ruby/core/kernel/instance_variables_tags.txt
diff --git a/spec/tags/ruby/core/kernel/lambda_tags.txt b/spec/tags/ruby/core/kernel/lambda_tags.txt
diff --git a/spec/tags/ruby/core/kernel/private_methods_tags.txt b/spec/tags/ruby/core/kernel/private_methods_tags.txt
diff --git a/spec/tags/ruby/core/kernel/protected_methods_tags.txt b/spec/tags/ruby/core/kernel/protected_methods_tags.txt
diff --git a/spec/tags/ruby/core/kernel/public_methods_tags.txt b/spec/tags/ruby/core/kernel/public_methods_tags.txt
diff --git a/spec/tags/ruby/core/kernel/require_tags.txt b/spec/tags/ruby/core/kernel/require_tags.txt
@@ -1,11 +1,4 @@
 fails(JRUBY-5668):Kernel#require ($LOAD_FEATURES) when a non-extensioned file is in $LOADED_FEATURES loads a .rb extensioned file when a non extensioned file is in $LOADED_FEATURES
 fails(JRUBY-5668):Kernel.require ($LOAD_FEATURES) when a non-extensioned file is in $LOADED_FEATURES loads a .rb extensioned file when a non extensioned file is in $LOADED_FEATURES
-fails:Kernel#require (concurrently) blocks a second thread from returning while the 1st is still requiring
-fails:Kernel#require (concurrently) blocks based on the path
-fails:Kernel#require (concurrently) allows a 2nd require if the 1st raised an exception
-fails:Kernel#require (concurrently) blocks a 3rd require if the 1st raises an exception and the 2nd is still running
-fails:Kernel#require (path resolution) does not load a bare filename unless the current working directory is in $LOAD_PATH
-fails:Kernel.require (path resolution) does not load a bare filename unless the current working directory is in $LOAD_PATH
-fails:Kernel#require (path resolution) does not load a relative path unless the current working directory is in $LOAD_PATH
-fails:Kernel.require (path resolution) does not load a relative path unless the current working directory is in $LOAD_PATH
-fails:Kernel.require (concurrently) allows a 2nd require if the 1st raised an exception
+critical(hangs:Kernel#require (concurrently) allows a 2nd require if the 1st raised an exception
+critical(hangs):Kernel.require (concurrently) allows a 2nd require if the 1st raised an exception
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:ARGF.filename returns the current file name on each file
		fails:ARGF.filename sets the $FILENAME global variable with the current file name on each file
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:ARGF.path returns the current file name on each file
		fails:ARGF.path sets the $FILENAME global variable with the current file name on each file
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Kernel.Complex() when passed a single non-Numeric coerces the passed argument using #to_c
		fails:Kernel.Complex() when passed [Integer] returns a new Complex number with 0 as the imaginary component