*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java	Fri Jul  7 09:29:33 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java	Fri Jul  7 09:29:33 2017

*** 25,34 ****
--- 25,35 ----
  import java.lang.invoke.MethodHandle;
  import java.lang.invoke.MethodHandles;
  import java.lang.invoke.MethodType;
  
  import org.graalvm.compiler.code.CompilationResult;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.test.ExportingClassLoader;
  import org.junit.Test;
  import org.objectweb.asm.ClassWriter;
  import org.objectweb.asm.Label;
  import org.objectweb.asm.MethodVisitor;

*** 102,117 ****
--- 103,118 ----
      public static Object invokeInterfaceHandle2(I o, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j) throws Throwable {
          return (int) INTERFACE_HANDLE_M2.invokeExact(o, a, b, c, d, e, f, g, h, i, j);
      }
  
      @Override
!     protected InstalledCode addMethod(DebugContext debug, ResolvedJavaMethod method, CompilationResult compResult) {
          if (method.getDeclaringClass().equals(getMetaAccess().lookupJavaType(M2Thrower.class))) {
              // Make sure M2Thrower.m2 is invoked from normal code
!             return getBackend().createDefaultInstalledCode(debug, method, compResult);
          }
!         return super.addMethod(debug, method, compResult);
      }
  
      /**
       * Try to exercise a mixed calling sequence with regular JIT code calling a method handle that
       * can't be inlined with an implementation compiled by Graal that throws an exception.