jruby · Apr 24, 2018 · Apr 24, 2018 · Apr 24, 2018 · Apr 24, 2018 · Apr 24, 2018
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -725,7 +725,7 @@ private RootNode addGetsLoop(RootNode oldRoot, boolean printing, boolean process
         BlockNode whileBody = new BlockNode(pos);
         newBody.add(new WhileNode(pos, new VCallNode(pos, "gets"), whileBody));
 
-        if (processLineEndings) whileBody.add(new CallNode(pos, dollarUnderscore, "chop!", null, null));
+        if (processLineEndings) whileBody.add(new CallNode(pos, dollarUnderscore, "chomp!", null, null));
         if (split) whileBody.add(new GlobalAsgnNode(pos, "$F", new CallNode(pos, dollarUnderscore, "split", null, null)));
 
         if (oldRoot.getBodyNode() instanceof BlockNode) {   // common case n stmts

diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1141,9 +1141,9 @@ private IRubyObject op_equalCommon(ThreadContext context, IRubyObject other) {
         return sites(context).equals.call(context, this, other, this).isTrue() ? runtime.getTrue() : runtime.getFalse();
     }
 
-    @JRubyMethod(name = "-@") // -'foo' returns frozen string
+    @JRubyMethod(name = "-@") // -'foo' returns deduplicated (interned) string
     public final IRubyObject minus_at(ThreadContext context) {
-        return isFrozen() ? this : context.runtime.freezeAndDedupString(this);
+        return context.runtime.freezeAndDedupString(this);
     }
 
     @JRubyMethod(name = "+@") // +'foo' returns modifiable string

diff --git a/core/src/main/java/org/jruby/RubySymbol.java b/core/src/main/java/org/jruby/RubySymbol.java
@@ -50,6 +50,7 @@
 import org.jruby.runtime.CallSite;
 import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.ContextAwareBlockBody;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.MethodIndex;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.Signature;
@@ -105,10 +106,11 @@ private RubySymbol(Ruby runtime, String internedSymbol, ByteList symbolBytes) {
         this.symbolBytes = symbolBytes;
         this.id = runtime.allocSymbolId();
 
+        long k0 = Helpers.hashStart(runtime, id);
         long hash = runtime.isSiphashEnabled() ? SipHashInline.hash24(
-                symbolHashSeedK0, 0, symbolBytes.getUnsafeBytes(),
+                k0, 0, symbolBytes.getUnsafeBytes(),
                 symbolBytes.getBegin(), symbolBytes.getRealSize()) :
-                PerlHash.hash(symbolHashSeedK0, symbolBytes.getUnsafeBytes(),
+                PerlHash.hash(k0, symbolBytes.getUnsafeBytes(),
                 symbolBytes.getBegin(), symbolBytes.getRealSize());
         this.hashCode = (int) hash;
         setFrozen(true);

diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -91,7 +91,7 @@ public class Sprintf {
     private static final String ERR_MALFORMED_DOT_NUM = "malformed format string - %.[0-9]";
     private static final String ERR_MALFORMED_STAR_NUM = "malformed format string - %*[0-9]";
     private static final String ERR_ILLEGAL_FORMAT_CHAR = "illegal format character - %";
-    private static final String ERR_INCOMPLETE_FORMAT_SPEC = "incomplete format specifier; use %%%% (double %%) instead";
+    private static final String ERR_INCOMPLETE_FORMAT_SPEC = "incomplete format specifier; use %% (double %) instead";
     private static final String ERR_MALFORMED_NAME = "malformed name - unmatched parenthesis";
 
     private static final ThreadLocal<Map<Locale, NumberFormat>> LOCALE_NUMBER_FORMATS = new ThreadLocal<Map<Locale, NumberFormat>>();

diff --git a/test/mri/excludes/TestRequire.rb b/test/mri/excludes/TestRequire.rb
@@ -7,6 +7,8 @@
 exclude :test_loading_fifo_threading_success, "we do not use IO to read files and so will not show as stopped while loading"
 exclude :test_race_exception, "needs investigation"
 exclude :test_require_changed_home, "needs investigation"
+exclude :test_require_insecure_path, "JRuby does not have null-terminated strings nor tainting"
+exclude :test_require_insecure_path_shift_jis, "JRuby does not have null-terminated strings nor tainting"
 exclude :test_require_nonascii, "needs investigation"
 exclude :test_require_nonascii_path_shift_jis, "needs investigation"
 exclude :test_require_path_home_1, "needs investigation"

diff --git a/test/mri/excludes/TestRubyOptions.rb b/test/mri/excludes/TestRubyOptions.rb
@@ -8,6 +8,7 @@
 exclude :test_dump_yydebug_with_rflag, "MRI-specific format"
 exclude :test_encoding, "needs investigation"
 exclude :test_eval, "needs investigation"
+exclude :test_flag_in_shebang, "unreliable with our bash script"
 exclude :test_frozen_string_literal_debug, "needs investigation #4303"
 exclude :test_indentation_check, "needs investigation"
 exclude :test_invalid_option, "needs investigation"