jruby · Apr 3, 2016 · Apr 3, 2016 · Apr 3, 2016 · Apr 3, 2016 · Apr 3, 2016
diff --git a/spec/ruby/command_line/frozen_strings_tags.txt b/spec/ruby/command_line/frozen_strings_tags.txt
diff --git a/spec/ruby/core/string/freeze_spec.rb b/spec/ruby/core/string/freeze_spec.rb
@@ -11,4 +11,8 @@
     "abc".object_id.should_not == "abc".object_id
   end
 
+  it "being a special form doesn't change the value of defined?" do
+    defined?("abc".freeze).should == "method"
+  end
+
 end
diff --git a/spec/ruby/command_line/dash_a_tags.txt → ...truffle/tags/command_line/dash_a_tags.txt b/spec/ruby/command_line/dash_a_tags.txt → ...truffle/tags/command_line/dash_a_tags.txt
diff --git a/spec/ruby/command_line/dash_e_tags.txt → ...truffle/tags/command_line/dash_e_tags.txt b/spec/ruby/command_line/dash_e_tags.txt → ...truffle/tags/command_line/dash_e_tags.txt
diff --git a/spec/ruby/command_line/dash_n_tags.txt → ...truffle/tags/command_line/dash_n_tags.txt b/spec/ruby/command_line/dash_n_tags.txt → ...truffle/tags/command_line/dash_n_tags.txt
diff --git a/spec/ruby/command_line/dash_p_tags.txt → ...truffle/tags/command_line/dash_p_tags.txt b/spec/ruby/command_line/dash_p_tags.txt → ...truffle/tags/command_line/dash_p_tags.txt
diff --git a/spec/ruby/command_line/dash_s_tags.txt → ...truffle/tags/command_line/dash_s_tags.txt b/spec/ruby/command_line/dash_s_tags.txt → ...truffle/tags/command_line/dash_s_tags.txt
diff --git a/spec/ruby/command_line/dash_upper_e_tags.txt → ...e/tags/command_line/dash_upper_e_tags.txt b/spec/ruby/command_line/dash_upper_e_tags.txt → ...e/tags/command_line/dash_upper_e_tags.txt
diff --git a/spec/ruby/command_line/dash_upper_f_tags.txt → ...e/tags/command_line/dash_upper_f_tags.txt b/spec/ruby/command_line/dash_upper_f_tags.txt → ...e/tags/command_line/dash_upper_f_tags.txt
diff --git a/spec/ruby/command_line/dash_upper_k_tags.txt → ...e/tags/command_line/dash_upper_k_tags.txt b/spec/ruby/command_line/dash_upper_k_tags.txt → ...e/tags/command_line/dash_upper_k_tags.txt
diff --git a/spec/ruby/command_line/dash_upper_u_tags.txt → ...e/tags/command_line/dash_upper_u_tags.txt b/spec/ruby/command_line/dash_upper_u_tags.txt → ...e/tags/command_line/dash_upper_u_tags.txt
diff --git a/spec/ruby/command_line/dash_x_tags.txt → ...truffle/tags/command_line/dash_x_tags.txt b/spec/ruby/command_line/dash_x_tags.txt → ...truffle/tags/command_line/dash_x_tags.txt
diff --git a/spec/truffle/tags/core/string/freeze_tags.txt b/spec/truffle/tags/core/string/freeze_tags.txt
diff --git a/spec/truffle/tags/language/string_tags.txt b/spec/truffle/tags/language/string_tags.txt
@@ -1,6 +1,3 @@
-fails:Ruby String literals with a magic frozen comment produce the same object each time
 slow:Ruby String literals with a magic frozen comment produce the same object each time
-fails:Ruby String literals with a magic frozen comment produce the same object for literals with the same content
 slow:Ruby String literals with a magic frozen comment produce the same object for literals with the same content
-fails:Ruby String literals with a magic frozen comment produce the same object for literals with the same content in different files
 slow:Ruby String literals with a magic frozen comment produce the same object for literals with the same content in different files
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -71,6 +71,7 @@ class MSpecScript
   set :backtrace_filter, /mspec\//
 
   set :tags_patterns, [
+    [%r(^.*/command_line/),             'spec/truffle/tags/command_line/'],
     [%r(^.*/language/),                 'spec/truffle/tags/language/'],
     [%r(^.*/core/),                     'spec/truffle/tags/core/'],
     [%r(^.*/library/),                  'spec/truffle/tags/library/'],

diff --git a/truffle/src/main/java/org/jruby/truffle/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/RubyContext.java
@@ -25,6 +25,7 @@
 import org.jruby.truffle.core.rope.RopeTable;
 import org.jruby.truffle.core.rubinius.RubiniusPrimitiveManager;
 import org.jruby.truffle.core.string.CoreStrings;
+import org.jruby.truffle.core.string.FrozenStrings;
 import org.jruby.truffle.core.symbol.SymbolTable;
 import org.jruby.truffle.core.thread.ThreadManager;
 import org.jruby.truffle.extra.AttachmentsManager;
@@ -76,6 +77,7 @@ public class RubyContext extends ExecutionContext {
     private final SourceCache sourceCache = new SourceCache(new SourceLoader(this));
     private final CallStackManager callStack = new CallStackManager(this);
     private final CoreStrings coreStrings = new CoreStrings(this);
+    private final FrozenStrings frozenStrings = new FrozenStrings(this);
 
     private final CompilerOptions compilerOptions = Truffle.getRuntime().createCompilerOptions();
 
@@ -332,6 +334,10 @@ public CoreStrings getCoreStrings() {
         return coreStrings;
     }
 
+    public FrozenStrings getFrozenStrings() {
+        return frozenStrings;
+    }
+
     public Object getClassVariableDefinitionLock() {
         return classVariableDefinitionLock;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java
@@ -16,6 +16,7 @@
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -102,6 +103,22 @@ public Rope getRope(byte[] bytes, Encoding encoding, CodeRange codeRange) {
         }
     }
 
+    public boolean contains(Rope rope) {
+        lock.readLock().lock();
+
+        try {
+            for (Map.Entry<Key, WeakReference<Rope>> entry : ropesTable.entrySet()) {
+                if (entry.getValue().get() == rope) {
+                    return true;
+                }
+            }
+        } finally {
+            lock.readLock().unlock();
+        }
+
+        return false;
+    }
+
     public int getByteArrayReusedCount() {
         return byteArrayReusedCount;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/CoreStrings.java b/truffle/src/main/java/org/jruby/truffle/core/string/CoreStrings.java
@@ -20,6 +20,7 @@ public class CoreStrings {
     public final CoreString GLOBAL_VARIABLE;
     public final CoreString INSTANCE_VARIABLE;
     public final CoreString LOCAL_VARIABLE;
+    public final CoreString METHOD;
     public final CoreString NIL;
     public final CoreString SELF;
     public final CoreString TRUE;
@@ -33,6 +34,7 @@ public CoreStrings(RubyContext context) {
         GLOBAL_VARIABLE = new CoreString(context, "global-variable");
         INSTANCE_VARIABLE = new CoreString(context, "instance-variable");
         LOCAL_VARIABLE = new CoreString(context, "local-variable");
+        METHOD = new CoreString(context, "method");
         NIL = new CoreString(context, "nil");
         SELF = new CoreString(context, "self");
         TRUE = new CoreString(context, "true");

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java b/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.core.string;
+
+import com.oracle.truffle.api.object.DynamicObject;
+import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.core.Layouts;
+import org.jruby.truffle.core.rope.Rope;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+public class FrozenStrings {
+
+    private final RubyContext context;
+
+    private final Map<Rope, DynamicObject> frozenStrings = new WeakHashMap<>();
+
+    public FrozenStrings(RubyContext context) {
+        this.context = context;
+    }
+
+    public synchronized DynamicObject getFrozenString(Rope rope) {
+        assert context.getRopeTable().contains(rope);
+
+        DynamicObject string = frozenStrings.get(rope);
+
+        if (string == null) {
+            string = StringOperations.createString(context, rope);
+            string.set(Layouts.FROZEN_IDENTIFIER, true);
+            frozenStrings.put(rope, string);
+        }
+
+        return string;
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java
@@ -478,6 +478,19 @@ public RubyNode visitCallNode(org.jruby.ast.CallNode node) {
         final org.jruby.ast.Node receiver = node.getReceiverNode();
         final String methodName = node.getName();
 
+        if (receiver instanceof org.jruby.ast.StrNode && methodName.equals("freeze")) {
+            final org.jruby.ast.StrNode strNode = (org.jruby.ast.StrNode) receiver;
+            final ByteList byteList = strNode.getValue();
+            final int codeRange = strNode.getCodeRange();
+
+            final Rope rope = context.getRopeTable().getRope(byteList.bytes(), byteList.getEncoding(), CodeRange.fromInt(codeRange));
+
+            final DynamicObject frozenString = context.getFrozenStrings().getFrozenString(rope);
+
+            return addNewlineIfNeeded(node, new DefinedWrapperNode(context, sourceSection, context.getCoreStrings().METHOD,
+                    new ObjectLiteralNode(context, null, frozenString)));
+        }
+
         // Rubinius.<method>
         if (receiver instanceof org.jruby.ast.ConstNode
                 && ((org.jruby.ast.ConstNode) receiver).getName().equals("Rubinius")) {
@@ -2893,10 +2906,23 @@ public RubyNode visitSplatNode(org.jruby.ast.SplatNode node) {
 
     @Override
     public RubyNode visitStrNode(org.jruby.ast.StrNode node) {
+        final SourceSection sourceSection = translate(node.getPosition());
+
         final ByteList byteList = node.getValue();
         final int codeRange = node.getCodeRange();
         final Rope rope = context.getRopeTable().getRope(byteList.bytes(), byteList.getEncoding(), CodeRange.fromInt(codeRange));
-        final RubyNode ret = new StringLiteralNode(context, translate(node.getPosition()), rope);
+
+        final RubyNode ret;
+
+        if (node.isFrozen()) {
+            final DynamicObject frozenString = context.getFrozenStrings().getFrozenString(rope);
+
+            ret = new DefinedWrapperNode(context, sourceSection, context.getCoreStrings().METHOD,
+                    new ObjectLiteralNode(context, null, frozenString));
+        } else {
+            ret = new StringLiteralNode(context, sourceSection, rope);
+        }
+
         return addNewlineIfNeeded(node, ret);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/TranslatorDriver.java b/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/TranslatorDriver.java
@@ -97,6 +97,11 @@ public RubyRootNode parse(RubyContext context, Source source, Encoding defaultEn
         boolean isInlineSource = parserContext == ParserContext.SHELL;
         boolean isEvalParse = parserContext == ParserContext.EVAL || parserContext == ParserContext.INLINE || parserContext == ParserContext.MODULE;
         final org.jruby.parser.ParserConfiguration parserConfiguration = new org.jruby.parser.ParserConfiguration(context.getJRubyRuntime(), 0, isInlineSource, !isEvalParse, false);
+
+        if (context.getJRubyRuntime().getInstanceConfig().isFrozenStringLiteral()) {
+            parserConfiguration.setFrozenStringLiteral(true);
+        }
+
         parserConfiguration.setDefaultEncoding(defaultEncoding);
 
         // Parse to the JRuby AST