[Truffle] Fix for last commit if the frame is not a Ruby frame.

jruby · Dec 14, 2015 · 0c35d5b · 0c35d5b
1 parent 39ac18b
commit 0c35d5b
Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java
@@ -152,6 +152,26 @@ public static MaterializedFrame tryGetDeclarationFrame(Object[] arguments) {
         return null;
     }
 
+    public static Object tryGetSelf(Object[] arguments) {
+        if (SELF_INDEX >= arguments.length) {
+            return null;
+        }
+        return arguments[SELF_INDEX];
+    }
+
+    public static DynamicObject tryGetBlock(Object[] arguments) {
+        if (BLOCK_INDEX >= arguments.length) {
+            return null;
+        }
+
+        final Object block = arguments[BLOCK_INDEX];
+        if (block instanceof DynamicObject) {
+            return (DynamicObject) block;
+        } else {
+            return null;
+        }
+    }
+
     public static MaterializedFrame getCallerFrame(Object[] arguments) {
         return (MaterializedFrame) arguments[CALLER_FRAME_INDEX];
     }

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
@@ -161,12 +161,12 @@ public static Set<DynamicObject> getObjectsInFrame(Frame frame) {
             objects.addAll(getObjectsInFrame(lexicalParentFrame));
         }
 
-        final Object self = RubyArguments.getSelf(arguments);
+        final Object self = RubyArguments.tryGetSelf(arguments);
         if (self instanceof DynamicObject) {
             objects.add((DynamicObject) self);
         }
 
-        final DynamicObject block = RubyArguments.getBlock(arguments);
+        final DynamicObject block = RubyArguments.tryGetBlock(arguments);
         if (block != null) {
             objects.add(block);
         }