--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java	2019-03-12 08:09:56.663709880 +0100
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java	2019-03-12 08:09:56.311707598 +0100
@@ -24,6 +24,7 @@
 
 package org.graalvm.compiler.nodes.graphbuilderconf;
 
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 import static org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.resolveType;
 
 import java.lang.reflect.Method;
@@ -177,6 +178,10 @@
 
     @Override
     public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] argsIncludingReceiver) {
+        if (IS_IN_NATIVE_IMAGE) {
+            // these are currently unimplemented
+            return false;
+        }
         ResolvedJavaMethod subst = getSubstitute(b.getMetaAccess());
         return b.intrinsify(bytecodeProvider, targetMethod, subst, receiver, argsIncludingReceiver);
     }