--- a/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLayout.java	Tue Oct 13 18:53:04 2015 +0200
+++ b/truffle/com.oracle.truffle.object.basic/src/com/oracle/truffle/object/basic/BasicLayout.java	Tue Oct 13 14:13:27 2015 +0200
@@ -23,6 +23,7 @@
 package com.oracle.truffle.object.basic;
 
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.object.Layout;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.ObjectLocation;
 import com.oracle.truffle.api.object.ObjectType;
@@ -34,6 +35,7 @@
 import com.oracle.truffle.object.Locations.DualLocation;
 import com.oracle.truffle.object.basic.BasicLocations.ObjectFieldLocation;
 import com.oracle.truffle.object.basic.BasicLocations.SimpleObjectFieldLocation;
+
 import java.util.EnumSet;
 
 public class BasicLayout extends LayoutImpl {
@@ -50,8 +52,8 @@
         this.objectArrayLocation = DynamicObjectBasic.OBJECT_ARRAY_LOCATION;
     }
 
-    static LayoutImpl createLayoutImpl(EnumSet<ImplicitCast> allowedImplicitCasts, LayoutStrategy strategy) {
-        return new BasicLayout(allowedImplicitCasts, strategy);
+    static LayoutImpl createLayoutImpl(Layout.Builder builder, LayoutStrategy strategy) {
+        return new BasicLayout(getAllowedImplicitCasts(builder), strategy);
     }
 
     @Override