jruby · Jul 6, 2017 · Jul 6, 2017 · Jul 6, 2017 · Jul 6, 2017 · Jul 6, 2017
diff --git a/core/pom.xml b/core/pom.xml
@@ -12,12 +12,12 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.11.0-SNAPSHOT</version>
+    <version>9.2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
   <properties>
-    <version.ruby>2.4.0</version.ruby>
+    <version.ruby>2.4.1</version.ruby>
     <prawn.dir>${test.dir}/prawn</prawn.dir>
     <spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -27,7 +27,7 @@ DO NOT MODIFIY - GENERATED CODE
     <jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
     <installer.gems>${jruby.win32ole.gem}</installer.gems>
     <prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
-    <version.ruby.minor>0</version.ruby.minor>
+    <version.ruby.minor>1</version.ruby.minor>
     <tzdata.version>2013d</tzdata.version>
     <install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
     <jay.bin>jay</jay.bin>
@@ -47,7 +47,7 @@ DO NOT MODIFIY - GENERATED CODE
     <parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
     <jruby.basedir>${basedir}/..</jruby.basedir>
     <rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
-    <version.ruby.revision>56780</version.ruby.revision>
+    <version.ruby.revision>58053</version.ruby.revision>
     <jruby.test.memory>3G</jruby.test.memory>
     <mspec.dir>${spec.dir}/mspec</mspec.dir>
     <build.date>${maven.build.timestamp}</build.date>

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -3753,8 +3753,6 @@ public IRubyObject getConstantFromNoConstMissing(String name) {
     }
 
     public IRubyObject getConstantFromNoConstMissing(String name, boolean includePrivate) {
-        assert name == name.intern() : name + " is not interned";
-
         final Ruby runtime = getRuntime();
         final RubyClass objectClass = runtime.getObject();
 

diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -72,6 +72,8 @@
 import org.jruby.util.cli.Options;
 import org.jruby.util.io.EncodingUtils;
 import org.jruby.util.collections.WeakValuedMap;
+
+import static org.jruby.util.StringSupport.EMPTY_BYTELIST_ARRAY;
 import static org.jruby.util.StringSupport.EMPTY_STRING_ARRAY;
 
 import java.util.Iterator;
@@ -1427,6 +1429,21 @@ public IRubyObject to_s() {
         } while (true);
     }
 
+    public ByteList[] getByteNames() {
+        int nameLength = pattern.numberOfNames();
+        if (nameLength == 0) return EMPTY_BYTELIST_ARRAY;
+
+        ByteList[] names = new ByteList[nameLength];
+        int j = 0;
+        for (Iterator<NameEntry> i = pattern.namedBackrefIterator(); i.hasNext();) {
+            NameEntry e = i.next();
+            names[j++] = new ByteList(e.name, e.nameP, e.nameEnd - e.nameP, pattern.getEncoding(), true);
+        }
+
+        return names;
+    }
+
+    @Deprecated
     public String[] getNames() {
         int nameLength = pattern.numberOfNames();
         if (nameLength == 0) return EMPTY_STRING_ARRAY;

diff --git a/core/src/main/java/org/jruby/RubySymbol.java b/core/src/main/java/org/jruby/RubySymbol.java
@@ -771,9 +771,10 @@ public RubySymbol fastGetSymbol(String internedName) {
 
         public RubySymbol fastGetSymbol(String internedName, boolean hard) {
             RubySymbol symbol = null;
+            int hash = javaStringHashCode(internedName);
 
-            for (SymbolEntry e = getEntryFromTable(symbolTable, internedName.hashCode()); e != null; e = e.next) {
-                if (isSymbolMatch(internedName, e)) {
+            for (SymbolEntry e = getEntryFromTable(symbolTable, hash); e != null; e = e.next) {
+                if (isSymbolMatch(internedName, hash, e)) {
                     if (hard) e.setHardReference();
                     symbol = e.symbol.get();
                     break;
@@ -799,10 +800,6 @@ private static boolean isSymbolMatch(ByteList bytes, int hash, SymbolEntry entry
             return hash == entry.hash && bytes.equals(entry.bytes);
         }
 
-        private static boolean isSymbolMatch(String internedName, SymbolEntry entry) {
-            return internedName == entry.name;
-        }
-
         private RubySymbol createSymbol(final String name, final ByteList value, final int hash, boolean hard) {
             ReentrantLock lock;
             (lock = tableLock).lock();

diff --git a/core/src/main/java/org/jruby/ast/ArgumentNode.java b/core/src/main/java/org/jruby/ast/ArgumentNode.java
@@ -33,25 +33,34 @@
 import org.jruby.ast.types.INameNode;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  * Simple Node for named entities.  Things like the name of a method will make a node
  * for the name.  Also local variables will make a ArgumentNode. In the case of a local
  * variable we will also keep a list of it's location.
  */
 public class ArgumentNode extends Node implements INameNode {
-    private String identifier;
+    private ByteList identifier;
     private int location;
 
+    @Deprecated
     public ArgumentNode(ISourcePosition position, String identifier) {
         super(position, false);
 
-        this.identifier = identifier;
+        this.identifier = StringSupport.stringAsByteList(identifier);
     }
 
+    @Deprecated
     public ArgumentNode(ISourcePosition position, String identifier, int location) {
-        this(position, identifier);
+        this(position, StringSupport.stringAsByteList(identifier), location);
+    }
 
+    public ArgumentNode(ISourcePosition position, ByteList identifier, int location) {
+        super(position, false);
+
+        this.identifier = identifier;
         this.location = location; // All variables should be depth 0 in this case
     }
 
@@ -82,13 +91,18 @@ public int getDepth() {
     public int getIndex() {
         return location & 0xffff;
     }
-    
+
     public String getName() {
+        return StringSupport.byteListAsString(identifier);
+    }
+
+    public ByteList getByteName() {
         return identifier;
     }
-
+
+    @Deprecated
     public void setName(String name) {
-        this.identifier = name;
+        this.identifier = StringSupport.stringAsByteList(name);
     }
 
     public List<Node> childNodes() {

diff --git a/core/src/main/java/org/jruby/ast/AttrAssignNode.java b/core/src/main/java/org/jruby/ast/AttrAssignNode.java
@@ -33,17 +33,19 @@
 import org.jruby.ast.types.INameNode;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  * Node that represents an assignment of either an array element or attribute.
  */
 public class AttrAssignNode extends Node implements INameNode, IArgumentNode {
     protected final Node receiverNode;
-    private String name;
+    private ByteList name;
     private Node argsNode;
     private final boolean isLazy;
 
-    public AttrAssignNode(ISourcePosition position, Node receiverNode, String name, Node argsNode, boolean isLazy) {
+    public AttrAssignNode(ISourcePosition position, Node receiverNode, ByteList name, Node argsNode, boolean isLazy) {
         super(position, receiverNode != null && receiverNode.containsVariableAssignment() || argsNode != null && argsNode.containsVariableAssignment());
 
         assert receiverNode != null : "receiverNode is not null";
@@ -58,6 +60,11 @@ public AttrAssignNode(ISourcePosition position, Node receiverNode, String name,
         this.isLazy = isLazy;
     }
 
+    @Deprecated
+    public AttrAssignNode(ISourcePosition position, Node receiverNode, String name, Node argsNode, boolean isLazy) {
+        this(position, receiverNode, StringSupport.stringAsByteList(name), argsNode, isLazy);
+    }
+
     public NodeType getNodeType() {
         return NodeType.ATTRASSIGNNODE;
     }
@@ -76,9 +83,13 @@ public Object accept(NodeVisitor visitor) {
      * @return name
      */
     public String getName() {
+        return StringSupport.byteListAsString(name);
+    }
+
+    public ByteList getByteName() {
         return name;
     }
-    
+
     /**
      * Gets the receiverNode.
      * receiverNode is the object on which the method is being called

diff --git a/core/src/main/java/org/jruby/ast/BackRefNode.java b/core/src/main/java/org/jruby/ast/BackRefNode.java
@@ -33,8 +33,10 @@
 
 import java.util.List;
 
+import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
 import org.jruby.util.DefinedMessage;
 
 /**
@@ -49,14 +51,11 @@ public class BackRefNode extends Node {
      * the character which generated the back reference
      **/
     private final char type;
-
-    /** ByteList for the name of this backref global */
-    private final DefinedMessage definedMessage;
 
     public BackRefNode(ISourcePosition position, int type) {
         super(position, false);
         this.type = (char) type;
-        this.definedMessage = DefinedMessage.byText("$" + (char)type);
+        DefinedMessage.byText("$" + (char)type);
     }
 
     public NodeType getNodeType() {
@@ -71,6 +70,10 @@ public <T> T accept(NodeVisitor<T> iVisitor) {
         return iVisitor.visitBackRefNode(this);
     }
 
+    public ByteList getByteName() {
+        return new ByteList(new byte[] {'$', (byte) type}, USASCIIEncoding.INSTANCE);
+    }
+
     /**
      * Gets the type 
      * 

diff --git a/core/src/main/java/org/jruby/ast/BlockArgNode.java b/core/src/main/java/org/jruby/ast/BlockArgNode.java
@@ -36,22 +36,30 @@
 import org.jruby.ast.types.INameNode;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  *	An explicit block argument (&amp;my_block) in parameter list.
  */
 public class BlockArgNode extends Node implements INameNode {
     private final int count;
-    private String name;
+    private ByteList name;
 
-    public BlockArgNode(ISourcePosition position, int count, String name) {
+    public BlockArgNode(ISourcePosition position, int count, ByteList name) {
         super(position, false);
         this.count = count;
         this.name = name;
     }
 
+    @Deprecated
+    public BlockArgNode(ISourcePosition position, int count, String name) {
+        this(position, count, StringSupport.stringAsByteList(name));
+    }
+
+
     public BlockArgNode(ArgumentNode argNode) {
-        this(argNode.getPosition(), argNode.getIndex(), argNode.getName());
+        this(argNode.getPosition(), argNode.getIndex(), argNode.getByteName());
     }
 
     public NodeType getNodeType() {
@@ -80,11 +88,16 @@ public int getCount() {
      * @return it's name
      */
     public String getName() {
+        return StringSupport.byteListAsString(name);
+    }
+
+    public ByteList getByteName() {
         return name;
     }
 
+    @Deprecated
     public void setName(String name) {
-        this.name = name;
+        this.name = StringSupport.stringAsByteList(name);
     }
 
     public List<Node> childNodes() {

diff --git a/core/src/main/java/org/jruby/ast/CallNode.java b/core/src/main/java/org/jruby/ast/CallNode.java
@@ -37,6 +37,8 @@
 import org.jruby.ast.types.INameNode;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  * A method or operator call.
@@ -45,20 +47,26 @@ public class CallNode extends Node implements INameNode, IArgumentNode, BlockAcc
     private final Node receiverNode;
     private Node argsNode;
     protected Node iterNode;
-    private String name;
+    private ByteList name;
     private final boolean isLazy;
 
     public CallNode(ISourcePosition position, Node receiverNode, String name, Node argsNode, 
             Node iterNode) {
         this(position, receiverNode, name, argsNode, iterNode, false);
     }
 
+    @Deprecated
     public CallNode(ISourcePosition position, Node receiverNode, String name, Node argsNode,
                     Node iterNode, boolean isLazy) {
+        this(position, receiverNode, StringSupport.stringAsByteList(name), argsNode, iterNode, isLazy);
+    }
+
+    public CallNode(ISourcePosition position, Node receiverNode, ByteList name, Node argsNode,
+                    Node iterNode, boolean isLazy) {
         super(position, receiverNode.containsVariableAssignment() ||
                 argsNode != null && argsNode.containsVariableAssignment() ||
                 iterNode != null && iterNode.containsVariableAssignment());
-        
+
         assert receiverNode != null : "receiverNode is not null";
 
         this.name = name;
@@ -116,6 +124,10 @@ public Node setArgsNode(Node argsNode) {
      * @return name
      */
     public String getName() {
+        return StringSupport.byteListAsString(name);
+    }
+
+    public ByteList getByteName() {
         return name;
     }
 

diff --git a/core/src/main/java/org/jruby/ast/ClassVarAsgnNode.java b/core/src/main/java/org/jruby/ast/ClassVarAsgnNode.java
@@ -36,23 +36,30 @@
 import org.jruby.ast.types.INameNode;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 /**
  * Class variable assignment node.
  */
 public class ClassVarAsgnNode extends AssignableNode implements INameNode {
-    private String name;
+    private ByteList name;
 
     /**
      * @param name id of the class variable to assign to
      * @param valueNode  Node used to compute the new value when the assignment is evaled
      */
-    public ClassVarAsgnNode(ISourcePosition position, String name, Node valueNode) {
+    public ClassVarAsgnNode(ISourcePosition position, ByteList name, Node valueNode) {
         super(position, valueNode, valueNode != null && valueNode.containsVariableAssignment());
 
         this.name = name;
     }
 
+    @Deprecated
+    public ClassVarAsgnNode(ISourcePosition position, String name, Node valueNode) {
+        this(position, StringSupport.stringAsByteList(name), valueNode);
+    }
+
     public NodeType getNodeType() {
         return NodeType.CLASSVARASGNNODE;
     }
@@ -70,9 +77,13 @@ public <T> T accept(NodeVisitor<T> iVisitor) {
      * @return Returns a String
      */
     public String getName() {
+        return StringSupport.byteListAsString(name);
+    }
+
+    public ByteList getByteName() {
         return name;
     }
-    
+
     public List<Node> childNodes() {
         return createList(getValueNode());
     }