[Truffle] Use OM DSL from Truffle.

jruby · Feb 7, 2016 · d3efd79 · d3efd79
1 parent 16d8a11
commit d3efd79
Showing 53 changed files with 76 additions and 2,060 deletions.
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -18,10 +18,11 @@
   repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
               :id => 'truffle' )
 
-  truffle_version = 'aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT'
+  truffle_version = '0.12-SNAPSHOT'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version
   jar 'com.oracle.truffle:truffle-debug:' + truffle_version
   jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
+  jar 'com.oracle.truffle:truffle-object-dsl-processor:' + truffle_version, :scope => 'provided'
   jar 'com.oracle.truffle:truffle-tck:' + truffle_version, :scope => 'test'
   jar 'junit:junit', :scope => 'test'
 
@@ -38,16 +39,10 @@
           'source' => [ '${base.java.version}', '1.7' ],
           'target' => [ '${base.javac.version}', '1.7' ],
           'useIncrementalCompilation' =>  'false' ) do
-    execute_goals( 'compile',
-                   :id => 'anno',
-                   :phase => 'process-resources',
-                   'includes' => [ 'org/jruby/truffle/om/dsl/processor/OMProcessor.java' ],
-                   'compilerArgs' => [ '-XDignore.symbol.file=true',
-                                       '-J-ea' ] )
     execute_goals( 'compile',
                    :id => 'default-compile',
                    :phase => 'compile',
-                   'annotationProcessors' => [ 'org.jruby.truffle.om.dsl.processor.OMProcessor',
+                   'annotationProcessors' => [ 'com.oracle.truffle.object.dsl.processor.OMProcessor',
                                                'com.oracle.truffle.dsl.processor.TruffleProcessor',
                                                'com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor',
                                                'com.oracle.truffle.dsl.processor.LanguageRegistrationProcessor' ],

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -41,23 +41,29 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-api</artifactId>
-      <version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
+      <version>0.12-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-debug</artifactId>
-      <version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
+      <version>0.12-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
+      <version>0.12-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.oracle.truffle</groupId>
+      <artifactId>truffle-object-dsl-processor</artifactId>
+      <version>0.12-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>aa58a258b10c344b8f3abca6a18911435a6f92fc-SNAPSHOT</version>
+      <version>0.12-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -99,22 +105,6 @@ DO NOT MODIFIY - GENERATED CODE
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <executions>
-          <execution>
-            <id>anno</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <includes>
-                <include>org/jruby/truffle/om/dsl/processor/OMProcessor.java</include>
-              </includes>
-              <compilerArgs>
-                <compilerArg>-XDignore.symbol.file=true</compilerArg>
-                <compilerArg>-J-ea</compilerArg>
-              </compilerArgs>
-            </configuration>
-          </execution>
           <execution>
             <id>default-compile</id>
             <phase>compile</phase>
@@ -123,7 +113,7 @@ DO NOT MODIFIY - GENERATED CODE
             </goals>
             <configuration>
               <annotationProcessors>
-                <annotationProcessor>org.jruby.truffle.om.dsl.processor.OMProcessor</annotationProcessor>
+                <annotationProcessor>com.oracle.truffle.object.dsl.processor.OMProcessor</annotationProcessor>
                 <annotationProcessor>com.oracle.truffle.dsl.processor.TruffleProcessor</annotationProcessor>
                 <annotationProcessor>com.oracle.truffle.dsl.processor.verify.VerifyTruffleProcessor</annotationProcessor>
                 <annotationProcessor>com.oracle.truffle.dsl.processor.LanguageRegistrationProcessor</annotationProcessor>

diff --git a/truffle/src/main/java/org/jruby/truffle/core/HandleLayout.java b/truffle/src/main/java/org/jruby/truffle/core/HandleLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface HandleLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLayout.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.object.ObjectType;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface ArrayLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectLayout.java b/truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectLayout.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.object.ObjectType;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout(objectTypeSuperclass = "org.jruby.truffle.language.RubyObjectType")
 public interface BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/binding/BindingLayout.java b/truffle/src/main/java/org/jruby/truffle/core/binding/BindingLayout.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface BindingLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterLayout.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jcodings.transcode.EConv;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface EncodingConverterLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingLayout.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jcodings.Encoding;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.util.ByteList;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionLayout.java b/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionLayout.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.language.backtrace.Backtrace;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberLayout.java b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberLayout.java
@@ -12,9 +12,9 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
-import org.jruby.truffle.om.dsl.api.Volatile;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
+import com.oracle.truffle.api.object.dsl.Volatile;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashLayout.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.object.ObjectType;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface HashLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassLayout.java b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.module.ModuleFields;
 import org.jruby.truffle.core.module.ModuleLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface ClassLayout extends ModuleLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/method/MethodLayout.java b/truffle/src/main/java/org/jruby/truffle/core/method/MethodLayout.java
@@ -15,7 +15,7 @@
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.jruby.truffle.language.methods.InternalMethod;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface MethodLayout extends BasicObjectLayout {
 
     DynamicObjectFactory createMethodShape(DynamicObject logicalClass,

diff --git a/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodLayout.java b/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.language.methods.InternalMethod;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleLayout.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface ModuleLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexLayout.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexLayout.java
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.locks.ReentrantLock;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface MutexLayout extends BasicObjectLayout {
 
     DynamicObjectFactory createMutexShape(DynamicObject logicalClass,

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumLayout.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 import java.math.BigInteger;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/proc/ProcLayout.java b/truffle/src/main/java/org/jruby/truffle/core/proc/ProcLayout.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.object.ObjectType;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.language.control.FrameOnStackMarker;
 import org.jruby.truffle.language.methods.InternalMethod;
 import org.jruby.truffle.language.methods.SharedMethodInfo;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/queue/QueueLayout.java b/truffle/src/main/java/org/jruby/truffle/core/queue/QueueLayout.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.object.ObjectType;
 
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 import java.util.concurrent.LinkedBlockingQueue;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueLayout.java b/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueLayout.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 import java.util.concurrent.BlockingQueue;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/range/IntegerFixnumRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/core/range/IntegerFixnumRangeLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface IntegerFixnumRangeLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/range/LongFixnumRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/core/range/LongFixnumRangeLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface LongFixnumRangeLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/range/ObjectRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/core/range/ObjectRangeLayout.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface ObjectRangeLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataLayout.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.joni.Region;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 
 @Layout
 public interface MatchDataLayout extends BasicObjectLayout {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpLayout.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.joni.Regex;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.rope.Rope;
 import org.jruby.util.RegexpOptions;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceLayout.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Volatile;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Volatile;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayLayout.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.jruby.util.ByteList;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/DirLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/DirLayout.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferLayout.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface IOBufferLayout extends BasicObjectLayout {
 
     String WRITE_SYNCED_IDENTIFIER = "@write_synced";

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOLayout.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface IOLayout extends BasicObjectLayout {
 
     String I_BUFFER_IDENTIFIER = "@ibuffer";

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerLayout.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import jnr.ffi.Pointer;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RandomizerLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RandomizerLayout.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.jruby.util.Random;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/WeakRefLayout.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/WeakRefLayout.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 import java.lang.ref.WeakReference;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringLayout.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringLayout.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.object.ObjectType;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.rope.Rope;
 
 @Layout

diff --git a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolLayout.java b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolLayout.java
@@ -12,10 +12,10 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.rope.Rope;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface SymbolLayout extends BasicObjectLayout {
 
     DynamicObjectFactory createSymbolShape(DynamicObject logicalClass,

diff --git a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadBacktraceLocationLayout.java b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadBacktraceLocationLayout.java
@@ -14,7 +14,7 @@
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.jruby.truffle.language.backtrace.Activation;
 
-@org.jruby.truffle.om.dsl.api.Layout
+@com.oracle.truffle.api.object.dsl.Layout
 public interface ThreadBacktraceLocationLayout extends BasicObjectLayout {
 
     DynamicObjectFactory createThreadBacktraceLocationShape(DynamicObject logicalClass,

diff --git a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadLayout.java b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadLayout.java
@@ -16,9 +16,9 @@
 import org.jruby.RubyThread;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.jruby.truffle.core.InterruptMode;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
-import org.jruby.truffle.om.dsl.api.Volatile;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
+import com.oracle.truffle.api.object.dsl.Volatile;
 import org.jruby.truffle.core.fiber.FiberManager;
 
 import java.util.List;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/time/TimeLayout.java b/truffle/src/main/java/org/jruby/truffle/core/time/TimeLayout.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import org.joda.time.DateTime;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 
 @Layout
 public interface TimeLayout extends BasicObjectLayout {

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
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Nullable.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Nullable.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/api/UnexpectedLayoutRefusalException.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/api/UnexpectedLayoutRefusalException.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Volatile.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/api/Volatile.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/OMProcessor.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/OMProcessor.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutParser.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutParser.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/LayoutModel.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/LayoutModel.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/NameUtils.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/NameUtils.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyBuilder.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyBuilder.java
diff --git a/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyModel.java b/truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/model/PropertyModel.java
diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalLayout.java b/truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalLayout.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 import java.math.BigDecimal;

diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/DigestLayout.java b/truffle/src/main/java/org/jruby/truffle/stdlib/DigestLayout.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
+import com.oracle.truffle.api.object.dsl.Layout;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 
 import java.security.MessageDigest;

diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/EmitterLayout.java b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/EmitterLayout.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.emitter.Emitter;

diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/ParserLayout.java b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/ParserLayout.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
-import org.jruby.truffle.om.dsl.api.Layout;
-import org.jruby.truffle.om.dsl.api.Nullable;
+import com.oracle.truffle.api.object.dsl.Layout;
+import com.oracle.truffle.api.object.dsl.Nullable;
 import org.jruby.truffle.core.basicobject.BasicObjectLayout;
 import org.yaml.snakeyaml.events.Event;
 import org.yaml.snakeyaml.parser.Parser;