Merge branch 'master' into truffle-head

# Conflicts: # bin/jruby.bash
jruby · Feb 15, 2016 · 9498ddf · 9498ddf
2 parents 8850f5d + 8e29ae1
commit 9498ddf
Showing 79 changed files with 180 additions and 203 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -235,15 +235,6 @@ do
                 opt="${opt:1}=false" ;;
             esac
             java_args=("${java_args[@]}" "-Dgraal.$opt")
-        elif [ "${val:0:15}" = "-Djvmci.option." ]; then # Graal options
-            opt=${val:15}
-            java_args=("${java_args[@]}" "-Dgraal.$opt")
-        elif [ "${val:0:15}" = "-Dgraal.option." ]; then # Graal options
-            opt=${val:15}
-            java_args=("${java_args[@]}" "-Dgraal.$opt")
-        elif [ "${val:0:8}" = "-Dgraal." ]; then # Graal options
-            opt=${val:8}
-            java_args=("${java_args[@]}" "-Dgraal.$opt")
         else
             if [ "${val:0:3}" = "-ea" ]; then
                 VERIFY_JRUBY="yes"

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -7,7 +7,6 @@
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'polyglot.dump.readonly' => true,
-
               'jruby.basedir' => '${basedir}/..' )
 
   jar 'org.yaml:snakeyaml:1.14'

diff --git a/truffle/src/main/java/org/jruby/truffle/core/ReturnEnumeratorIfNoBlockNode.java b/truffle/src/main/java/org/jruby/truffle/core/ReturnEnumeratorIfNoBlockNode.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.core.array.ArrayUtils;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.arguments.RubyArguments;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyGuards;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
@@ -27,9 +27,9 @@
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.USASCIIEncoding;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayOperations.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayOperations.java
@@ -11,7 +11,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyGuards;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/TaintResultNode.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.arguments.RubyArguments;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/coerce/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/core/coerce/ToIntNode.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreLibrary;
 import org.jruby.truffle.core.Layouts;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackNode.java
@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.array.ArrayUtils;
 import org.jruby.truffle.core.format.runtime.PackFrameDescriptor;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadLongOrBigIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadLongOrBigIntegerNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.nodes.PackGuards;
 import org.jruby.truffle.core.format.nodes.PackNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/type/ToStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/type/ToStringNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.nodes.PackNode;
 import org.jruby.truffle.core.format.runtime.exceptions.NoImplicitConversionException;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/write/WritePaddedBytesNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/write/WritePaddedBytesNode.java
@@ -13,7 +13,7 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.utilities.ConditionProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.nodes.PackNode;
 import org.jruby.util.ByteList;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyGuards;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.core.hash;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
@@ -20,9 +20,9 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreClass;
 import org.jruby.truffle.core.CoreMethod;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.basicobject.BasicObjectNodes;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java
@@ -17,9 +17,9 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.basicobject.BasicObjectNodes;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
@@ -32,9 +32,9 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Property;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.Encoding;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java
@@ -23,8 +23,8 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
@@ -27,10 +27,10 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
-import com.oracle.truffle.api.utilities.ValueProfile;
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.runtime.Visibility;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreClass;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java
@@ -17,9 +17,9 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreClass;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumOrBignumNode.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumOrBignumNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreLibrary;
 import org.jruby.truffle.core.Layouts;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java
@@ -21,8 +21,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.USASCIIEncoding;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/BignumPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/BignumPrimitiveNodes.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java
@@ -15,8 +15,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.CoreClass;
 import org.jruby.truffle.core.CoreMethod;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/CallRubiniusPrimitiveNode.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/CallRubiniusPrimitiveNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.core.rubinius;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.ReturnException;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/FixnumPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/FixnumPrimitiveNodes.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.numeric.BignumNodes;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/FloatPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/FloatPrimitiveNodes.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/InvokeRubiniusPrimitiveNode.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/InvokeRubiniusPrimitiveNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.core.rubinius;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ObjectPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ObjectPrimitiveNodes.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.objects.IsTaintedNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java
@@ -11,8 +11,8 @@
 package org.jruby.truffle.core.rubinius;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java
@@ -63,8 +63,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.Encoding;
 import org.jcodings.exception.EncodingException;
 import org.jcodings.specific.ASCIIEncoding;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/InterpolatedStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/string/InterpolatedStringNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.cast.ToSNode;
 import org.jruby.truffle.core.rubinius.StringPrimitiveNodes;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -37,9 +37,9 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import jnr.posix.POSIX;
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/time/ReadTimeZoneNode.java b/truffle/src/main/java/org/jruby/truffle/core/time/ReadTimeZoneNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.joda.time.DateTimeZone;
 import org.jruby.truffle.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java b/truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java
@@ -25,9 +25,13 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -112,7 +116,7 @@ public IsExecutableNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public boolean isExecutable(VirtualFrame frame, TruffleObject receiver) {
-            return (boolean) ForeignAccess.execute(node, frame, receiver, receiver);
+            return (boolean) ForeignAccess.sendIsExecutable(node, frame, receiver);
         }
 
     }
@@ -164,7 +168,7 @@ public boolean isBoxedPrimitive(VirtualFrame frame, CharSequence receiver) {
 
         @Specialization
         public boolean isBoxedPrimitive(VirtualFrame frame, TruffleObject receiver) {
-            return (boolean) ForeignAccess.execute(node, frame, receiver);
+            return (boolean) ForeignAccess.sendIsBoxed(node, frame, receiver);
         }
 
         @Specialization(guards = {"!isTruffleObject(receiver)", "!isJavaCharSequence(receiver)"})
@@ -186,7 +190,7 @@ public IsNullNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public boolean isNull(VirtualFrame frame, TruffleObject receiver) {
-            return (boolean) ForeignAccess.execute(node, frame, receiver);
+            return (boolean) ForeignAccess.sendIsNull(node, frame, receiver);
         }
 
     }
@@ -203,7 +207,7 @@ public HasSizePropertyNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public boolean hasSizeProperty(VirtualFrame frame, TruffleObject receiver) {
-            return (boolean) ForeignAccess.execute(node, frame, receiver);
+            return (boolean) ForeignAccess.sendHasSize(node, frame, receiver);
         }
 
     }
@@ -233,7 +237,12 @@ public Object readProperty(VirtualFrame frame,
                                    TruffleObject receiver,
                                    Object identifier,
                                    @Cached("createReadNode()") Node readNode) {
-            return ForeignAccess.execute(readNode, frame, receiver, identifier);
+            try {
+                return ForeignAccess.sendRead(readNode, frame, receiver, identifier);
+            } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         @Specialization(guards = {"isRubySymbol(identifier)", "identifier == cachedIdentifier"})
@@ -243,7 +252,12 @@ public Object readProperty(VirtualFrame frame,
                                    @Cached("identifier") DynamicObject cachedIdentifier,
                                    @Cached("identifier.toString()") String identifierString,
                                    @Cached("createReadNode()") Node readNode) {
-            return ForeignAccess.execute(readNode, frame, receiver, identifierString);
+            try {
+                return ForeignAccess.sendRead(readNode, frame, receiver, identifierString);
+            } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         @Specialization(guards = {"isRubyString(identifier)", "ropesEqual(identifier, cachedIdentifier)"})
@@ -253,7 +267,12 @@ public Object readProperty(VirtualFrame frame,
                                    @Cached("privatizeRope(identifier)") Rope cachedIdentifier,
                                    @Cached("identifier.toString()") String identifierString,
                                    @Cached("createReadNode()") Node readNode) {
-            return ForeignAccess.execute(readNode, frame, receiver, identifierString);
+            try {
+                return ForeignAccess.sendRead(readNode, frame, receiver, identifierString);
+            } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         protected static Node createReadNode() {
@@ -280,7 +299,12 @@ public Object writeProperty(VirtualFrame frame,
                                     Object identifier,
                                     Object value,
                                     @Cached("createWriteNode()") Node writeNode) {
-            return ForeignAccess.execute(writeNode, frame, receiver, identifier, value);
+            try {
+                return ForeignAccess.sendWrite(writeNode, frame, receiver, identifier, value);
+            } catch (UnknownIdentifierException | UnsupportedTypeException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         @Specialization(guards = {"isRubySymbol(identifier)", "identifier == cachedIdentifier"})
@@ -291,7 +315,12 @@ public Object writeProperty(VirtualFrame frame,
                                     @Cached("identifier") DynamicObject cachedIdentifier,
                                     @Cached("identifier.toString()") String identifierString,
                                     @Cached("createWriteNode()") Node writeNode) {
-            return ForeignAccess.execute(writeNode, frame, receiver, identifierString, value);
+            try {
+                return ForeignAccess.sendWrite(writeNode, frame, receiver, identifierString, value);
+            } catch (UnknownIdentifierException | UnsupportedTypeException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         @Specialization(guards = {"isRubyString(identifier)", "ropesEqual(identifier, cachedIdentifier)"})
@@ -302,7 +331,12 @@ public Object writeProperty(VirtualFrame frame,
                                     @Cached("privatizeRope(identifier)") Rope cachedIdentifier,
                                     @Cached("identifier.toString()") String identifierString,
                                     @Cached("createWriteNode()") Node writeNode) {
-            return ForeignAccess.execute(writeNode, frame, receiver, identifierString, value);
+            try {
+                return ForeignAccess.sendWrite(writeNode, frame, receiver, identifierString, value);
+            } catch (UnknownIdentifierException | UnsupportedTypeException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
         protected static Node createWriteNode() {
@@ -360,7 +394,12 @@ public DynamicObject executeForeign(VirtualFrame frame, CharSequence receiver) {
 
         @Specialization
         public Object executeForeign(VirtualFrame frame, TruffleObject receiver) {
-            return ForeignAccess.execute(node, frame, receiver);
+            try {
+                return ForeignAccess.sendUnbox(node, frame, receiver);
+            } catch (UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
     }
@@ -380,7 +419,12 @@ public Object executeForeign(VirtualFrame frame, TruffleObject receiver, Object[
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 this.node = Message.createExecute(args.length).createNode();
             }
-            return ForeignAccess.execute(node, frame, receiver, args);
+            try {
+                return ForeignAccess.sendExecute(node, frame, receiver, args);
+            } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
     }
@@ -402,7 +446,12 @@ public Object executeForeign(VirtualFrame frame, String receiver) {
 
         @Specialization
         public Object executeForeign(VirtualFrame frame, TruffleObject receiver) {
-            return ForeignAccess.execute(node, frame, receiver);
+            try {
+                return ForeignAccess.sendGetSize(node, frame, receiver);
+            } catch (UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RuntimeException(e);
+            }
         }
 
     }
@@ -493,6 +542,7 @@ protected CallTarget parse(DynamicObject mimeType, DynamicObject source) {
             try {
                 return getContext().getEnv().parse(sourceObject);
             } catch (IOException e) {
+                CompilerDirectives.transferToInterpreter();
                 throw new RuntimeException(e);
             }
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadBlockNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadBlockNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadCallerFrameNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadCallerFrameNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.arguments;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.NotProvided;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordArgumentNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.hash.HashOperations;
 import org.jruby.truffle.language.RubyGuards;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyGuards;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPreArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPreArgumentNode.java
@@ -10,9 +10,9 @@
 package org.jruby.truffle.language.arguments;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ValueProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.NotProvided;
 import org.jruby.truffle.language.RubyNode;
@@ -27,7 +27,7 @@ public class ReadPreArgumentNode extends RubyNode {
     private final BranchProfile outOfRangeProfile = BranchProfile.create();
     private final MissingArgumentBehaviour missingArgumentBehaviour;
 
-    private final ValueProfile argumentValueProfile = ValueProfile.createPrimitiveProfile();
+    private final ValueProfile argumentValueProfile = ValueProfile.createEqualityProfile();
 
     public ReadPreArgumentNode(RubyContext context, SourceSection sourceSection, int index, MissingArgumentBehaviour missingArgumentBehaviour) {
         super(context, sourceSection);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRemainingArgumentsNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRemainingArgumentsNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.arguments;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java
@@ -12,8 +12,8 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.array.ArrayUtils;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ShouldDestructureNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ShouldDestructureNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.arguments;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java
@@ -16,8 +16,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.kernel.KernelNodes.RequireNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java
@@ -18,8 +18,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.core.module.ModuleOperations;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/AndNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/AndNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.cast.BooleanCastNode;
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/IfNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/IfNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.cast.BooleanCastNode;
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/OrNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/OrNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.cast.BooleanCastNode;
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/control/WhileNode.java b/truffle/src/main/java/org/jruby/truffle/language/control/WhileNode.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RepeatingNode;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.cast.BooleanCastNode;
 import org.jruby.truffle.core.cast.BooleanCastNodeGen;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBooleanDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBooleanDispatchNode.java
@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.BranchProfile;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.methods.InternalMethod;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedDispatchNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.BranchProfile;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.string.StringOperations;
 import org.jruby.truffle.language.RubyGuards;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedForeignDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedForeignDispatchNode.java
@@ -11,9 +11,12 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -98,27 +101,33 @@ private Object doDispatch(VirtualFrame frame, TruffleObject receiverObject, Obje
             CompilerDirectives.transferToInterpreter();
             throw new IllegalStateException();
         }
-        if (directArray != null) {
-            Object[] args = prepareArguments.convertArguments(frame, arguments, 0);
-            return ForeignAccess.execute(directArray, frame, receiverObject, args);
-        } else if (directField != null) {
-            Object[] args = prepareArguments.convertArguments(frame, arguments, 1);
-            args[0] = nameForMessage;
-            return ForeignAccess.execute(directField, frame, receiverObject, args);
-        } else if (directCall != null) {
-            Object[] args;
-            args = prepareArguments.convertArguments(frame, arguments, 0);
-            return ForeignAccess.execute(directCall, frame, receiverObject, args);
-        } else if (nullCheck != null) {
-            Object[] args = prepareArguments.convertArguments(frame, arguments, 0);
-            return ForeignAccess.execute(nullCheck, frame, receiverObject, args);
-        } else if (access != null) {
-            Object[] args = prepareArguments.convertArguments(frame, arguments, 1);
-            args[0] = name;
-            return ForeignAccess.execute(access, frame, receiverObject, args);
-        } else {
+
+        try {
+            if (directArray != null) {
+                Object[] args = prepareArguments.convertArguments(frame, arguments, 0);
+                return ForeignAccess.sendExecute(directArray, frame, receiverObject, args);
+            } else if (directField != null) {
+                Object[] args = prepareArguments.convertArguments(frame, arguments, 1);
+                args[0] = nameForMessage;
+                return ForeignAccess.sendExecute(directField, frame, receiverObject, args);
+            } else if (directCall != null) {
+                Object[] args;
+                args = prepareArguments.convertArguments(frame, arguments, 0);
+                return ForeignAccess.sendExecute(directCall, frame, receiverObject, args);
+            } else if (nullCheck != null) {
+                Object[] args = prepareArguments.convertArguments(frame, arguments, 0);
+                return ForeignAccess.sendExecute(nullCheck, frame, receiverObject, args);
+            } else if (access != null) {
+                Object[] args = prepareArguments.convertArguments(frame, arguments, 1);
+                args[0] = name;
+                return ForeignAccess.sendExecute(access, frame, receiverObject, args);
+            } else {
+                CompilerDirectives.transferToInterpreter();
+                throw new IllegalStateException();
+            }
+        } catch (ArityException | UnsupportedMessageException | UnsupportedTypeException e) {
             CompilerDirectives.transferToInterpreter();
-            throw new IllegalStateException();
+            throw new RuntimeException(e);
         }
     }
 

diff --git a/...le/src/main/java/org/jruby/truffle/language/dispatch/CachedForeignGlobalDispatchNode.java b/...le/src/main/java/org/jruby/truffle/language/dispatch/CachedForeignGlobalDispatchNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/UncachedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/UncachedDispatchNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.utilities.BranchProfile;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.array.ArrayUtils;
 import org.jruby.truffle.core.conversion.ToJavaStringNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/exceptions/EnsureNode.java b/truffle/src/main/java/org/jruby/truffle/language/exceptions/EnsureNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/exceptions/TryNode.java b/truffle/src/main/java/org/jruby/truffle/language/exceptions/TryNode.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchBreakNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchBreakNode.java
@@ -10,9 +10,9 @@
 package org.jruby.truffle.language.methods;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.BreakException;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForLambdaNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForLambdaNode.java
@@ -11,9 +11,9 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.BreakException;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForMethodNode.java
@@ -11,9 +11,9 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.RaiseException;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForProcNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForProcNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.NextException;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchNextNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchNextNode.java
@@ -10,8 +10,8 @@
 package org.jruby.truffle.language.methods;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.NextException;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java
@@ -14,8 +14,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.exceptions.MainExitException;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.Layouts;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ReadInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ReadInstanceVariableNode.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/SelfNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/SelfNode.java
@@ -10,16 +10,16 @@
 package org.jruby.truffle.language.objects;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ValueProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.arguments.RubyArguments;
 
 public class SelfNode extends RubyNode {
 
-    private final ValueProfile valueProfile = ValueProfile.createPrimitiveProfile();
+    private final ValueProfile valueProfile = ValueProfile.createEqualityProfile();
 
     public SelfNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
@@ -715,9 +715,9 @@ public FrameSlot getFrameOnStackMarkerSlot() {
         }
     }
 
-    public static final FrameSlot BAD_FRAME_SLOT = new FrameSlot(null, null, null, 0, null);
+    public static final Object BAD_FRAME_SLOT = new Object();
 
-    public Deque<FrameSlot> frameOnStackMarkerSlotStack = new ArrayDeque<>();
+    public Deque<Object> frameOnStackMarkerSlotStack = new ArrayDeque<>();
 
     protected ArgumentsAndBlockTranslation translateArgumentsAndBlock(SourceSection sourceSection, org.jruby.ast.Node iterNode, org.jruby.ast.Node argsNode, String nameToSetWhenTranslatingBlock) {
         assert !(argsNode instanceof org.jruby.ast.IterNode);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/translator/MethodTranslator.java
@@ -162,7 +162,7 @@ context, considerExtendingMethodToCoverEnd(bodyLambda.getEncapsulatingSourceSect
         final CallTarget callTargetAsProc = Truffle.getRuntime().createCallTarget(newRootNodeForProcs);
 
 
-        FrameSlot frameOnStackMarkerSlot;
+        Object frameOnStackMarkerSlot;
 
         if (frameOnStackMarkerSlotStack.isEmpty()) {
             frameOnStackMarkerSlot = null;
@@ -175,7 +175,7 @@ context, considerExtendingMethodToCoverEnd(bodyLambda.getEncapsulatingSourceSect
         }
 
         return new BlockDefinitionNode(context, newRootNodeForProcs.getEncapsulatingSourceSection(), type, environment.getSharedMethodInfo(),
-                callTargetAsProc, callTargetAsLambda, environment.getBreakID(), frameOnStackMarkerSlot);
+                callTargetAsProc, callTargetAsLambda, environment.getBreakID(), (FrameSlot) frameOnStackMarkerSlot);
     }
 
     private boolean shouldConsiderDestructuringArrayArg(Arity arity) {

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/java/BaseLibC.java b/truffle/src/main/java/org/jruby/truffle/platform/java/BaseLibC.java
@@ -255,6 +255,7 @@ public int fcntl(int fd, int fnctl) {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public int fcntl(int fd, int fnctl, int... arg) {
         throw new UnsupportedOperationException();
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/platform/java/POSIXDelegator.java b/truffle/src/main/java/org/jruby/truffle/platform/java/POSIXDelegator.java
@@ -635,6 +635,7 @@ public MsgHdr allocateMsgHdr() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public int fcntl(int fd, Fcntl fcntlConst, int... arg) {
         return delegateTo.fcntl(fd, fcntlConst, arg);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalNodes.java
@@ -19,8 +19,8 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
-import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.RubyBignum;
 import org.jruby.RubyFixnum;