Fixes #4621. jrubyc compiled representation breaks but source rb work…

…s fine. yay for object identity instead of a nice equals...
jruby · Aug 18, 2017 · 7118975 · 7118975 · flash-gordon · Aug 18, 2017
1 parent f83a55f
commit 7118975
Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/operands/Hash.java b/core/src/main/java/org/jruby/ir/operands/Hash.java
@@ -107,7 +107,7 @@ public Object retrieve(ThreadContext context, IRubyObject self, StaticScope curr
         RubyHash hash;
         Iterator<KeyValuePair<Operand, Operand>> it = pairs.iterator();
 
-        if (isKWArgsHash && pairs.get(0).getKey() == Symbol.KW_REST_ARG_DUMMY) {
+        if (isKWArgsHash && pairs.get(0).getKey().equals(Symbol.KW_REST_ARG_DUMMY)) {
             // Dup the rest args hash and use that as the basis for inserting the non-rest args
             hash = ((RubyHash) pairs.get(0).getValue().retrieve(context, self, currScope, currDynScope, temp)).dupFast(context);
             // Skip the first pair

diff --git a/core/src/main/java/org/jruby/ir/operands/Symbol.java b/core/src/main/java/org/jruby/ir/operands/Symbol.java
@@ -25,6 +25,12 @@ public Symbol(ByteList bytes) {
         this.bytes = bytes;
     }
 
+    public boolean equals(Object other) {
+        if (!(other instanceof Symbol)) return false;
+
+        return bytes.equals(((Symbol) other).bytes);
+    }
+
     @Override
     public OperandType getOperandType() {
         return OperandType.SYMBOL;