jruby · Mar 3, 2015 · Mar 3, 2015
diff --git a/spec/truffle/tags/core/array/clone_tags.txt b/spec/truffle/tags/core/array/clone_tags.txt
diff --git a/spec/truffle/tags/core/hash/clone_tags.txt b/spec/truffle/tags/core/hash/clone_tags.txt
diff --git a/spec/truffle/tags/core/kernel/clone_tags.txt b/spec/truffle/tags/core/kernel/clone_tags.txt
diff --git a/spec/truffle/tags/core/object/clone_tags.txt b/spec/truffle/tags/core/object/clone_tags.txt
diff --git a/spec/truffle/tags/core/string/clone_tags.txt b/spec/truffle/tags/core/string/clone_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -419,9 +419,11 @@ public RubyClass getClass(Object self) {
 
     }
 
-    @CoreMethod(names = "clone")
+    @CoreMethod(names = "clone", taintFrom = 0)
     public abstract static class CloneNode extends CoreMethodNode {
 
+        private final ConditionProfile frozenProfile = ConditionProfile.createBinaryProfile();
+
         @Child private CallDispatchHeadNode initializeCloneNode;
 
         public CloneNode(RubyContext context, SourceSection sourceSection) {
@@ -449,6 +451,10 @@ public Object clone(VirtualFrame frame, RubyBasicObject self) {
             newObject.getOperations().setInstanceVariables(newObject, self.getOperations().getInstanceVariables(self));
             initializeCloneNode.call(frame, newObject, "initialize_clone", null, self);
 
+            if (frozenProfile.profile(self.isFrozen())) {
+                newObject.freeze();
+            }
+
             return newObject;
         }