src/share/vm/jvmci/jvmciCompilerToVM.cpp

*** 619,634 ****
  C2V_VMENTRY(jint, constantPoolRemapInstructionOperandFromCache, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index))
    constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool);
    return cp->remap_instruction_operand_from_cache(index);
  C2V_END
  
! C2V_VMENTRY(jobject, resolveFieldInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index, jbyte opcode, jlongArray info_handle))
    ResourceMark rm;
    constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool);
    Bytecodes::Code code = (Bytecodes::Code)(((int) opcode) & 0xFF);
    fieldDescriptor fd;
!   LinkInfo link_info(cp, index, CHECK_0);
    LinkResolver::resolve_field(fd, link_info, Bytecodes::java_code(code), false, CHECK_0);
    typeArrayOop info = (typeArrayOop) JNIHandles::resolve(info_handle);
    assert(info != NULL && info->length() == 2, "must be");
    info->long_at_put(0, (jlong) fd.access_flags().as_int());
    info->long_at_put(1, (jlong) fd.offset());
--- 619,634 ----
  C2V_VMENTRY(jint, constantPoolRemapInstructionOperandFromCache, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index))
    constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool);
    return cp->remap_instruction_operand_from_cache(index);
  C2V_END
  
! C2V_VMENTRY(jobject, resolveFieldInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index, jobject jvmci_method, jbyte opcode, jlongArray info_handle))
    ResourceMark rm;
    constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool);
    Bytecodes::Code code = (Bytecodes::Code)(((int) opcode) & 0xFF);
    fieldDescriptor fd;
!   LinkInfo link_info(cp, index, (jvmci_method != NULL) ? CompilerToVM::asMethod(jvmci_method) : NULL, CHECK_0);
    LinkResolver::resolve_field(fd, link_info, Bytecodes::java_code(code), false, CHECK_0);
    typeArrayOop info = (typeArrayOop) JNIHandles::resolve(info_handle);
    assert(info != NULL && info->length() == 2, "must be");
    info->long_at_put(0, (jlong) fd.access_flags().as_int());
    info->long_at_put(1, (jlong) fd.offset());
*** 660,670 ****
    KlassHandle h_resolved   (THREAD, method->method_holder());
    Symbol* h_name      = method->name();
    Symbol* h_signature = method->signature();
  
    bool check_access = true;
!   LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass, check_access);
    methodHandle m;
    // Only do exact lookup if receiver klass has been linked.  Otherwise,
    // the vtable has not been setup, and the LinkResolver will fail.
    if (recv_klass->is_array_klass() ||
        InstanceKlass::cast(recv_klass())->is_linked() && !recv_klass->is_interface()) {
--- 660,670 ----
    KlassHandle h_resolved   (THREAD, method->method_holder());
    Symbol* h_name      = method->name();
    Symbol* h_signature = method->signature();
  
    bool check_access = true;
!   LinkInfo link_info(h_resolved, h_name, h_signature, caller_klass, NULL, check_access);
    methodHandle m;
    // Only do exact lookup if receiver klass has been linked.  Otherwise,
    // the vtable has not been setup, and the LinkResolver will fail.
    if (recv_klass->is_array_klass() ||
        InstanceKlass::cast(recv_klass())->is_linked() && !recv_klass->is_interface()) {
*** 1439,1449 ****
    {CC "lookupMethodInPool",                           CC "(" HS_CONSTANT_POOL "IB)" HS_RESOLVED_METHOD,                                     FN_PTR(lookupMethodInPool)},
    {CC "constantPoolRemapInstructionOperandFromCache", CC "(" HS_CONSTANT_POOL "I)I",                                                        FN_PTR(constantPoolRemapInstructionOperandFromCache)},
    {CC "resolveConstantInPool",                        CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolveConstantInPool)},
    {CC "resolvePossiblyCachedConstantInPool",          CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolvePossiblyCachedConstantInPool)},
    {CC "resolveTypeInPool",                            CC "(" HS_CONSTANT_POOL "I)" HS_RESOLVED_KLASS,                                       FN_PTR(resolveTypeInPool)},
!   {CC "resolveFieldInPool",                           CC "(" HS_CONSTANT_POOL "IB[J)" HS_RESOLVED_KLASS,                                    FN_PTR(resolveFieldInPool)},
    {CC "resolveInvokeDynamicInPool",                   CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeDynamicInPool)},
    {CC "resolveInvokeHandleInPool",                    CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeHandleInPool)},
    {CC "resolveMethod",                                CC "(" HS_RESOLVED_KLASS HS_RESOLVED_METHOD HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD, FN_PTR(resolveMethod)},
    {CC "getVtableIndexForInterfaceMethod",             CC "(" HS_RESOLVED_KLASS HS_RESOLVED_METHOD ")I",                                     FN_PTR(getVtableIndexForInterfaceMethod)},
    {CC "getClassInitializer",                          CC "(" HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD,                                      FN_PTR(getClassInitializer)},
--- 1439,1449 ----
    {CC "lookupMethodInPool",                           CC "(" HS_CONSTANT_POOL "IB)" HS_RESOLVED_METHOD,                                     FN_PTR(lookupMethodInPool)},
    {CC "constantPoolRemapInstructionOperandFromCache", CC "(" HS_CONSTANT_POOL "I)I",                                                        FN_PTR(constantPoolRemapInstructionOperandFromCache)},
    {CC "resolveConstantInPool",                        CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolveConstantInPool)},
    {CC "resolvePossiblyCachedConstantInPool",          CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolvePossiblyCachedConstantInPool)},
    {CC "resolveTypeInPool",                            CC "(" HS_CONSTANT_POOL "I)" HS_RESOLVED_KLASS,                                       FN_PTR(resolveTypeInPool)},
!   {CC "resolveFieldInPool",                           CC "(" HS_CONSTANT_POOL "I" HS_RESOLVED_METHOD "B[J)" HS_RESOLVED_KLASS,              FN_PTR(resolveFieldInPool)},
    {CC "resolveInvokeDynamicInPool",                   CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeDynamicInPool)},
    {CC "resolveInvokeHandleInPool",                    CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeHandleInPool)},
    {CC "resolveMethod",                                CC "(" HS_RESOLVED_KLASS HS_RESOLVED_METHOD HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD, FN_PTR(resolveMethod)},
    {CC "getVtableIndexForInterfaceMethod",             CC "(" HS_RESOLVED_KLASS HS_RESOLVED_METHOD ")I",                                     FN_PTR(getVtableIndexForInterfaceMethod)},
    {CC "getClassInitializer",                          CC "(" HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD,                                      FN_PTR(getClassInitializer)},