[Truffle] Adopt OM API changes

jruby · Oct 10, 2014 · 6f89fe8 · 6f89fe8
1 parent aecd46a
commit 6f89fe8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/objectstorage/MigrateNode.java b/core/src/main/java/org/jruby/truffle/nodes/objectstorage/MigrateNode.java
@@ -9,7 +9,7 @@
  */
 package org.jruby.truffle.nodes.objectstorage;
 
-import com.oracle.truffle.om.Obsolescence;
+import com.oracle.truffle.om.impl.Obsolescence;
 import com.oracle.truffle.om.Shape;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 

diff --git a/...src/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedReadObjectFieldNode.java b/...src/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedReadObjectFieldNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.om.Location;
-import com.oracle.truffle.om.Obsolescence;
+import com.oracle.truffle.om.impl.Obsolescence;
 import com.oracle.truffle.om.Property;
 import com.oracle.truffle.om.Shape;
 import org.jruby.truffle.runtime.core.RubyBasicObject;

diff --git a/...rc/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedWriteObjectFieldNode.java b/...rc/main/java/org/jruby/truffle/nodes/objectstorage/UninitializedWriteObjectFieldNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.om.Location;
-import com.oracle.truffle.om.Obsolescence;
+import com.oracle.truffle.om.impl.Obsolescence;
 import com.oracle.truffle.om.Property;
 import com.oracle.truffle.om.Shape;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
@@ -34,7 +34,6 @@ public void execute(RubyBasicObject object, Object value) {
         final Shape currentShape = object.dynamicObject.getShape();
 
         // If the current shape is obsolete, add a node to migrate
-
         if (Obsolescence.checkForObsoleteShapeAndMigrate(object.dynamicObject)) {
             final MigrateNode migrateNode = new MigrateNode(currentShape, this);
             replace(migrateNode);

diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.atomic.*;
 
 import com.oracle.truffle.om.Shape;
+import com.oracle.truffle.om.impl.ShapeImpl;
 import com.oracle.truffle.om.SharedData;
 import com.oracle.truffle.api.instrument.SourceCallback;
 import org.jruby.Ruby;
@@ -91,7 +92,7 @@ public RubyContext(Ruby runtime) {
         // Object space manager needs to come early before we create any objects
         objectSpaceManager = new ObjectSpaceManager(this);
 
-        emptyShape = new Shape(RubyBasicObject.LAYOUT, new SharedData(), new RubyOperations());
+        emptyShape = new ShapeImpl(RubyBasicObject.LAYOUT, new SharedData(), new RubyOperations());
 
         // See note in CoreLibrary#initialize to see why we need to break this into two statements
         coreLibrary = new CoreLibrary(this);

diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyOperations.java b/core/src/main/java/org/jruby/truffle/runtime/RubyOperations.java
@@ -9,7 +9,15 @@
  */
 package org.jruby.truffle.runtime;
 
-import com.oracle.truffle.om.*;
+
+import com.oracle.truffle.om.Shape;
+import com.oracle.truffle.om.impl.ShapeImpl;
+import com.oracle.truffle.om.impl.PropertyImpl;
+import com.oracle.truffle.om.impl.Obsolescence;
+import com.oracle.truffle.om.DynamicObject;
+import com.oracle.truffle.om.Operations;
+import com.oracle.truffle.om.Property;
+import com.oracle.truffle.om.Location;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 
 import java.util.LinkedHashMap;
@@ -29,7 +37,7 @@ public void setInstanceVariable(RubyBasicObject receiver, String name, Object va
             property.setGeneric(receiver.dynamicObject, value);
         } else {
             Obsolescence.checkForObsoleteShapeAndMigrate(receiver.dynamicObject);
-            Shape newShape = shape.addProperty(new Property(name, shape.allocator().newLocationForValue(value, false), 0));
+            Shape newShape = shape.addProperty(new PropertyImpl(name, shape.allocator().newLocationForValue(value, false), 0));
             Obsolescence.checkForObsoleteShapeAndMigrate(receiver.dynamicObject);
 
             try {