jruby · Aug 26, 2015 · Aug 26, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
@@ -16,6 +16,8 @@
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.object.Shape;
+
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
@@ -24,7 +26,7 @@
 
 public class CachedBoxedDispatchNode extends CachedDispatchNode {
 
-    private final DynamicObject expectedClass;
+    private final Shape expectedShape;
     private final Assumption unmodifiedAssumption;
 
     private final InternalMethod method;
@@ -35,6 +37,7 @@ public CachedBoxedDispatchNode(
             RubyContext context,
             Object cachedName,
             DispatchNode next,
+            Shape expectedShape,
             DynamicObject expectedClass,
             InternalMethod method,
             boolean indirect,
@@ -43,7 +46,7 @@ public CachedBoxedDispatchNode(
 
         assert RubyGuards.isRubyClass(expectedClass);
 
-        this.expectedClass = expectedClass;
+        this.expectedShape = expectedShape;
         this.unmodifiedAssumption = Layouts.MODULE.getFields(expectedClass).getUnmodifiedAssumption();
         this.next = next;
         this.method = method;
@@ -68,7 +71,7 @@ public CachedBoxedDispatchNode(
     public boolean guard(Object methodName, Object receiver) {
         return guardName(methodName) &&
                 (receiver instanceof DynamicObject) &&
-                Layouts.BASIC_OBJECT.getMetaClass(((DynamicObject) receiver)) == expectedClass;
+                ((DynamicObject) receiver).getShape() == expectedShape;
     }
 
     @Override
@@ -137,7 +140,7 @@ public Object executeDispatch(
     public String toString() {
         return String.format("CachedBoxedDispatchNode(:%s, %s@%x, %s)",
                 getCachedNameAsSymbol().toString(),
-                Layouts.MODULE.getFields(expectedClass).getName(), expectedClass.hashCode(),
+                expectedShape, expectedShape.hashCode(),
                 method == null ? "null" : method.toString());
     }
 

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
@@ -197,7 +197,7 @@ private DispatchNode doDynamicObject(
         if (RubyGuards.isRubySymbol(receiverObject)) {
             return new CachedBoxedSymbolDispatchNode(getContext(), methodName, first, method, indirect, getDispatchAction());
         } else {
-            return new CachedBoxedDispatchNode(getContext(), methodName, first,
+            return new CachedBoxedDispatchNode(getContext(), methodName, first, ((DynamicObject) receiverObject).getShape(),
                     getContext().getCoreLibrary().getMetaClass(receiverObject), method, indirect, getDispatchAction());
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Layout.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Layout.java
@@ -174,7 +174,7 @@
  * indirection so you may want to cache the result (against the shape).
  *
  * You can also use the getter and setter against the {@code DynamicObjectFactory} that
- * {@code createFooShape} returns, with the setter reutrning a new factory. This allows
+ * {@code createFooShape} returns, with the setter returning a new factory. This allows
  * objects to be created with modified shape properties, and is much more efficient than
  * using the instance setter after creating the object.
  *