jruby · May 8, 2017 · May 8, 2017 · May 8, 2017 · May 8, 2017
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -3759,8 +3759,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/ast/FalseNode.java b/core/src/main/java/org/jruby/ast/FalseNode.java
@@ -42,7 +42,7 @@
  * Represents a false literal.
  */
 public class FalseNode extends Node implements INameNode, SideEffectFree {
-    ByteList FALSE = new ByteList(new byte[] {'f', 'a', 'l', 's', 'e'});
+    static final ByteList FALSE = new ByteList(new byte[] {'f', 'a', 'l', 's', 'e'});
 
     public FalseNode(ISourcePosition position) {
         super(position, false);

diff --git a/core/src/main/java/org/jruby/ast/NilNode.java b/core/src/main/java/org/jruby/ast/NilNode.java
@@ -42,7 +42,7 @@
  * represents 'nil'
  */
 public class NilNode extends Node implements INameNode, SideEffectFree {
-    ByteList NIL = new ByteList(new byte[] {'n', 'i', 'l'});
+    static final ByteList NIL = new ByteList(new byte[] {'n', 'i', 'l'});
 
     public NilNode(ISourcePosition position) {
         super(position, false);

diff --git a/core/src/main/java/org/jruby/ast/SelfNode.java b/core/src/main/java/org/jruby/ast/SelfNode.java
@@ -42,7 +42,7 @@
  * Represents 'self' keyword
  */
 public class SelfNode extends Node implements INameNode, SideEffectFree {
-    ByteList SELF = new ByteList(new byte[] {'s', 'e', 'l', 'f'});
+    static final ByteList SELF = new ByteList(new byte[] {'s', 'e', 'l', 'f'});
 
     public SelfNode(ISourcePosition position) {
         super(position, false);

diff --git a/core/src/main/java/org/jruby/ast/TrueNode.java b/core/src/main/java/org/jruby/ast/TrueNode.java
@@ -41,7 +41,7 @@
  * Represents 'true'.
  */
 public class TrueNode extends Node implements INameNode, SideEffectFree {
-    ByteList TRUE = new ByteList(new byte[] {'t', 'r', 'u', 'e'});
+    static final ByteList TRUE = new ByteList(new byte[] {'t', 'r', 'u', 'e'});
 
     public TrueNode(ISourcePosition position) {
         super(position, false);

diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.jcodings.Encoding;
+import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.RubyBignum;
 import org.jruby.RubyRegexp;
 import org.jruby.ast.*;
@@ -1659,8 +1660,11 @@ public Node new_defined(ISourcePosition position, Node something) {
         return new DefinedNode(position, something);
     }
 
+    public static final ByteList INTERNAL_ID = new ByteList(new byte[] {}, USASCIIEncoding.INSTANCE);
+
+    @Deprecated
     public String internalId() {
-        return "";
+        return INTERNAL_ID.toString();
     }
 
 }
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
@@ -5363,7 +5363,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 };
 states[586] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = support.internalId();
+                    yyVal = support.INTERNAL_ID;
     return yyVal;
   }
 };

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -2518,7 +2518,7 @@ f_kwrest        : kwrest_mark tIDENTIFIER {
                     $$ = $2;
                 }
                 | kwrest_mark {
-                    $$ = support.internalId();
+                    $$ = support.INTERNAL_ID;
                 }
 
 f_opt           : f_arg_asgn '=' arg_value {