[Truffle] Update Shape in read field node before dropping to uncached…

… case.
jruby · Dec 18, 2015 · cd849bb · cd849bb
1 parent bfbfd04
commit cd849bb
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadHeadObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadHeadObjectFieldNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.objectstorage;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -46,12 +47,22 @@ protected Object readObjectFieldCached(DynamicObject receiver,
         }
     }
 
+    @Specialization(guards = "updateShape(object)")
+    public Object updateShapeAndRead(DynamicObject object) {
+        return execute(object);
+    }
+
     @TruffleBoundary
-    @Specialization
+    @Specialization(contains = { "readObjectFieldCached", "updateShapeAndRead" })
     protected Object readObjectFieldUncached(DynamicObject receiver) {
         return receiver.get(name, defaultValue);
     }
 
+    protected boolean updateShape(DynamicObject object) {
+        CompilerDirectives.transferToInterpreter();
+        return object.updateShape();
+    }
+
     protected int getCacheLimit() {
         return Options.FIELD_LOOKUP_CACHE;
     }