[Truffle] Iterate objects stored in Queue/SizedQueue.

jruby · Dec 3, 2015 · 7b0e0da · 7b0e0da
1 parent 8e1dd9f
commit 7b0e0da
Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/spec/truffle/specs/truffle/objspace/reachable_objects_from_spec.rb b/spec/truffle/specs/truffle/objspace/reachable_objects_from_spec.rb
@@ -34,4 +34,24 @@
     reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
     reachable.should include(captured)
   end
+
+  it "finds an object stored in a Queue" do
+    require 'thread'
+    o = Object.new
+    q = Queue.new
+    q << o
+
+    reachable = ObjectSpace.reachable_objects_from(q)
+    reachable.should include(o)
+  end
+
+  it "finds an object stored in a SizedQueue" do
+    require 'thread'
+    o = Object.new
+    q = SizedQueue.new(3)
+    q << o
+
+    reachable = ObjectSpace.reachable_objects_from(q)
+    reachable.should include(o)
+  end
 end
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectGraph.java b/truffle/src/main/java/org/jruby/truffle/runtime/object/ObjectGraph.java
@@ -136,6 +136,12 @@ public static Set<DynamicObject> getAdjacentObjects(DynamicObject object) {
                         reachable.add((DynamicObject) element);
                     }
                 }
+            } else if (propertyValue instanceof Collection<?>) {
+                for (Object element : ((Collection<?>) propertyValue)) {
+                    if (element instanceof DynamicObject) {
+                        reachable.add((DynamicObject) element);
+                    }
+                }
             } else if (propertyValue instanceof Frame) {
                 reachable.addAll(getObjectsInFrame((Frame) propertyValue));
             } else if (propertyValue instanceof ObjectGraphNode) {