[Truffle] Fix guards for foreign dispatch.

jruby · Oct 15, 2015 · 47d19d5 · 47d19d5
1 parent 0664b73
commit 47d19d5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
@@ -82,10 +82,10 @@ public DispatchNode call() throws Exception {
                     newDispathNode = new UncachedDispatchNode(getContext(), ignoreVisibility, getDispatchAction(), missingBehavior);
                 } else {
                     depth++;
-                    if (receiverObject instanceof DynamicObject) {
-                        newDispathNode = doDynamicObject(frame, first, receiverObject, methodName, argumentsObjects);
-                    } else if (RubyGuards.isForeignObject(receiverObject)) {
+                    if (RubyGuards.isForeignObject(receiverObject)) {
                         newDispathNode = createForeign(argumentsObjects, first, methodName);
+                    } else if (RubyGuards.isRubyBasicObject(receiverObject)) {
+                        newDispathNode = doDynamicObject(frame, first, receiverObject, methodName, argumentsObjects);
                     } else {
                         newDispathNode = doUnboxedObject(frame, first, receiverObject, methodName);
                     }