jruby · Nov 27, 2015 · Nov 27, 2015
Showing with 32 additions and 7 deletions.

+27 −0 spec/truffle/specs/truffle/objspace/reachable_objects_from_spec.rb

+1 −3 truffle/src/main/java/org/jruby/truffle/runtime/core/ModuleFields.java

+4 −4 truffle/src/main/java/org/jruby/truffle/runtime/methods/InternalMethod.java
diff --git a/spec/truffle/specs/truffle/objspace/reachable_objects_from_spec.rb b/spec/truffle/specs/truffle/objspace/reachable_objects_from_spec.rb
@@ -0,0 +1,27 @@
+require_relative '../../../../ruby/spec_helper'
+require 'objspace'
+
+# Truffle-specific behavior
+describe "ObjectSpace.reachable_objects_from" do
+  it "enumerates objects directly reachable from a given object" do
+    ObjectSpace.reachable_objects_from(nil).should == [NilClass]
+    ObjectSpace.reachable_objects_from(['a', 'b', 'c']).should == [Array, 'a', 'b', 'c']
+    ObjectSpace.reachable_objects_from(Object.new).should == [Object]
+  end
+
+  it "finds a variable captured by a block captured by #define_method" do
+    captured = Object.new
+    obj = Object.new
+    block = lambda {
+      captured
+    }
+    obj.singleton_class.send(:define_method, :capturing_method, block)
+
+    meth = obj.method(:capturing_method)
+    reachable = ObjectSpace.reachable_objects_from(meth)
+    reachable.should include(Method, obj)
+
+    reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
+    reachable.should include(captured)
+  end
+end
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/ModuleFields.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/ModuleFields.java
@@ -636,9 +636,7 @@ public Set<DynamicObject> getAdjacentObjects() {
         }
 
         for (InternalMethod method : methods.values()) {
-            if (method.getProc() != null) {
-                adjacent.add(method.getProc());
-            }
+            adjacent.addAll(method.getAdjacentObjects());
         }
 
         return adjacent;

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/methods/InternalMethod.java b/truffle/src/main/java/org/jruby/truffle/runtime/methods/InternalMethod.java
@@ -82,10 +82,6 @@ public boolean isUndefined() {
         return undefined;
     }
 
-    public DynamicObject getProc() {
-        return proc;
-    }
-
     public CallTarget getCallTarget(){
         return callTarget;
     }
@@ -159,6 +155,10 @@ public Set<DynamicObject> getAdjacentObjects() {
             adjacent.add(declaringModule);
         }
 
+        if (proc != null) {
+            adjacent.add(proc);
+        }
+
         return adjacent;
     }