--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java	Mon Dec 12 16:16:27 2016 +0300
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java	Wed Mar 22 13:42:45 2017 -0700
@@ -135,7 +135,7 @@
                 String type = nameAndType.getType(cp);
 
                 if (opcode == Bytecodes.INVOKEINTERFACE) {
-                    method = resolveMethod(cls, name, type, false);
+                    method = resolveMethod(cp.context, cls, name, type, false);
                     if (method == null) {
                         throw new NoSuchMethodError(cls.toJavaName() + "." + name + type);
                     }
@@ -143,13 +143,13 @@
                         throw new IncompatibleClassChangeError("cannot invokeinterface " + method.format("%H.%n(%P)%R"));
                     }
                 } else if (opcode == Bytecodes.INVOKEVIRTUAL || opcode == Bytecodes.INVOKESPECIAL) {
-                    method = resolveMethod(cls, name, type, false);
+                    method = resolveMethod(cp.context, cls, name, type, false);
                     if (method == null) {
                         throw new NoSuchMethodError(cls.toJavaName() + "." + name + type);
                     }
                 } else {
                     assert opcode == Bytecodes.INVOKESTATIC;
-                    method = resolveMethod(cls, name, type, true);
+                    method = resolveMethod(cp.context, cls, name, type, true);
                     if (method == null) {
                         throw new NoSuchMethodError(cls.toJavaName() + "." + name + type);
                     }
@@ -186,7 +186,7 @@
                 String name = nameAndType.getName(cp);
                 String type = nameAndType.getType(cp);
                 assert opcode == GETFIELD || opcode == GETSTATIC || opcode == PUTFIELD || opcode == PUTSTATIC : opcode;
-                field = resolveField(cls, name, type, opcode == GETSTATIC || opcode == PUTSTATIC);
+                field = resolveField(cp.context, cls, name, type, opcode == GETSTATIC || opcode == PUTSTATIC);
                 if (field == null) {
                     throw new NoSuchFieldError(cls.toJavaName() + "." + name + " " + type);
                 }
@@ -273,19 +273,19 @@
         }
     }
 
-    static ResolvedJavaMethod resolveMethod(ResolvedJavaType c, String name, String descriptor, boolean isStatic) {
-        ResolvedJavaMethod method = ClassfileBytecodeProvider.findMethod(c, name, descriptor, isStatic);
+    static ResolvedJavaMethod resolveMethod(ClassfileBytecodeProvider context, ResolvedJavaType c, String name, String descriptor, boolean isStatic) {
+        ResolvedJavaMethod method = context.findMethod(c, name, descriptor, isStatic);
         if (method != null) {
             return method;
         }
         if (!c.isJavaLangObject() && !c.isInterface()) {
-            method = resolveMethod(c.getSuperclass(), name, descriptor, isStatic);
+            method = resolveMethod(context, c.getSuperclass(), name, descriptor, isStatic);
             if (method != null) {
                 return method;
             }
         }
         for (ResolvedJavaType i : c.getInterfaces()) {
-            method = resolveMethod(i, name, descriptor, isStatic);
+            method = resolveMethod(context, i, name, descriptor, isStatic);
             if (method != null) {
                 return method;
             }
@@ -293,19 +293,19 @@
         return null;
     }
 
-    static ResolvedJavaField resolveField(ResolvedJavaType c, String name, String fieldType, boolean isStatic) {
-        ResolvedJavaField field = ClassfileBytecodeProvider.findField(c, name, fieldType, isStatic);
+    static ResolvedJavaField resolveField(ClassfileBytecodeProvider context, ResolvedJavaType c, String name, String fieldType, boolean isStatic) {
+        ResolvedJavaField field = context.findField(c, name, fieldType, isStatic);
         if (field != null) {
             return field;
         }
         if (!c.isJavaLangObject() && !c.isInterface()) {
-            field = resolveField(c.getSuperclass(), name, fieldType, isStatic);
+            field = resolveField(context, c.getSuperclass(), name, fieldType, isStatic);
             if (field != null) {
                 return field;
             }
         }
         for (ResolvedJavaType i : c.getInterfaces()) {
-            field = resolveField(i, name, fieldType, isStatic);
+            field = resolveField(context, i, name, fieldType, isStatic);
             if (field != null) {
                 return field;
             }