[GR-17457] Fix frozen check for attr_writer

PullRequest: truffleruby/2419

Author: eregon

spec/ruby/core/module/attr_accessor_spec.rb

@@ -33,7 +33,20 @@ class TrueClass
       attr_accessor :spec_attr_accessor
     end
 
-    -> { true.spec_attr_accessor = "a" }.should raise_error(RuntimeError)
+    -> { true.spec_attr_accessor = "a" }.should raise_error(FrozenError)
+  end
+
+  it "raises FrozenError if the receiver if frozen" do
+    c = Class.new do
+      attr_accessor :foo
+    end
+    obj = c.new
+    obj.foo = 1
+    obj.foo.should == 1
+
+    obj.freeze
+    -> { obj.foo = 42 }.should raise_error(FrozenError)
+    obj.foo.should == 1
   end
 
   it "converts non string/symbol names to strings using to_str" do

spec/ruby/core/module/attr_writer_spec.rb

@@ -29,7 +29,17 @@ class TrueClass
       attr_writer :spec_attr_writer
     end
 
-    -> { true.spec_attr_writer = "a" }.should raise_error(RuntimeError)
+    -> { true.spec_attr_writer = "a" }.should raise_error(FrozenError)
+  end
+
+  it "raises FrozenError if the receiver if frozen" do
+    c = Class.new do
+      attr_writer :foo
+    end
+    obj = c.new
+    obj.freeze
+
+    -> { obj.foo = 42 }.should raise_error(FrozenError)
   end
 
   it "converts non string/symbol names to strings using to_str" do

src/main/java/org/truffleruby/language/objects/WriteInstanceVariableNode.java

@@ -19,18 +19,17 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.truffleruby.language.library.RubyLibrary;
 
 public class WriteInstanceVariableNode extends RubyContextSourceNode implements AssignableNode {
 
     private final String name;
 
     @Child private RubyNode receiver;
+    @Child private RubyLibrary rubyLibrary;
     @Child private RubyNode rhs;
     @Child private WriteObjectFieldNode writeNode;
 
-    private final ConditionProfile objectProfile = ConditionProfile.create();
-
     public WriteInstanceVariableNode(String name, RubyNode receiver, RubyNode rhs) {
         this.name = name;
         this.receiver = receiver;
@@ -52,23 +51,31 @@ public void assign(VirtualFrame frame, Object value) {
     }
 
     private void write(Object object, Object value) {
-        if (objectProfile.profile(object instanceof RubyDynamicObject)) {
-            if (writeNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                writeNode = insert(WriteObjectFieldNode.create());
-            }
-
-            writeNode.execute((RubyDynamicObject) object, name, value);
-        } else {
+        if (getRubyLibrary().isFrozen(object)) {
             throw new RaiseException(getContext(), coreExceptions().frozenError(object, this));
         }
+
+        if (writeNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            writeNode = insert(WriteObjectFieldNode.create());
+        }
+
+        writeNode.execute((RubyDynamicObject) object, name, value);
     }
 
     @Override
     public Object isDefined(VirtualFrame frame, RubyLanguage language, RubyContext context) {
         return coreStrings().ASSIGNMENT.createInstance(context);
     }
 
+    private RubyLibrary getRubyLibrary() {
+        if (rubyLibrary == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            rubyLibrary = insert(RubyLibrary.getFactory().createDispatched(getRubyLibraryCacheLimit()));
+        }
+        return rubyLibrary;
+    }
+
     @Override
     public AssignableNode toAssignableNode() {
         this.rhs = null;

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -1916,8 +1916,7 @@ public RubyNode visitInstAsgnNode(InstAsgnParseNode node) {
             rhs = node.getValueNode().accept(this);
         }
 
-        RubyNode self = new SelfNode(environment.getFrameDescriptor());
-        self = TypeNodes.CheckFrozenNode.create(self);
+        final RubyNode self = new SelfNode(environment.getFrameDescriptor());
         final RubyNode ret = new WriteInstanceVariableNode(name, self, rhs);
         ret.unsafeSetSourceSection(sourceSection);
         return addNewlineIfNeeded(node, ret);