src/share/vm/prims/methodHandles.cpp

*** 107,116 ****
--- 107,117 ----
  enum {
    IS_METHOD            = java_lang_invoke_MemberName::MN_IS_METHOD,
    IS_CONSTRUCTOR       = java_lang_invoke_MemberName::MN_IS_CONSTRUCTOR,
    IS_FIELD             = java_lang_invoke_MemberName::MN_IS_FIELD,
    IS_TYPE              = java_lang_invoke_MemberName::MN_IS_TYPE,
+   CALLER_SENSITIVE     = java_lang_invoke_MemberName::MN_CALLER_SENSITIVE,
    REFERENCE_KIND_SHIFT = java_lang_invoke_MemberName::MN_REFERENCE_KIND_SHIFT,
    REFERENCE_KIND_MASK  = java_lang_invoke_MemberName::MN_REFERENCE_KIND_MASK,
    SEARCH_SUPERCLASSES  = java_lang_invoke_MemberName::MN_SEARCH_SUPERCLASSES,
    SEARCH_INTERFACES    = java_lang_invoke_MemberName::MN_SEARCH_INTERFACES,
    ALL_KINDS      = IS_METHOD | IS_CONSTRUCTOR | IS_FIELD | IS_TYPE
*** 205,218 ****
    } else {
      flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT);
      vmindex = m->vtable_index();
    }
  
!   java_lang_invoke_MemberName::set_flags(mname_oop,    flags);
    java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
!   java_lang_invoke_MemberName::set_vmindex(mname_oop,  vmindex);   // vtable/itable index
!   java_lang_invoke_MemberName::set_clazz(mname_oop,    receiver_limit->java_mirror());
    // Note:  name and type can be lazily computed by resolve_MemberName,
    // if Java code needs them as resolved String and MethodType objects.
    // The clazz must be eagerly stored, because it provides a GC
    // root to help keep alive the Method*.
    // If relevant, the vtable or itable value is stored as vmindex.
--- 206,224 ----
    } else {
      flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT);
      vmindex = m->vtable_index();
    }
  
!   // @CallerSensitive annotation detected
!   if (m->caller_sensitive()) {
!     flags |= CALLER_SENSITIVE;
!   }
! 
!   java_lang_invoke_MemberName::set_flags(   mname_oop, flags);
    java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
!   java_lang_invoke_MemberName::set_vmindex( mname_oop, vmindex);   // vtable/itable index
!   java_lang_invoke_MemberName::set_clazz(   mname_oop, receiver_limit->java_mirror());
    // Note:  name and type can be lazily computed by resolve_MemberName,
    // if Java code needs them as resolved String and MethodType objects.
    // The clazz must be eagerly stored, because it provides a GC
    // root to help keep alive the Method*.
    // If relevant, the vtable or itable value is stored as vmindex.
*** 938,947 ****
--- 944,954 ----
      template(MethodHandles,GC_COUNT_GWT) \
      template(java_lang_invoke_MemberName,MN_IS_METHOD) \
      template(java_lang_invoke_MemberName,MN_IS_CONSTRUCTOR) \
      template(java_lang_invoke_MemberName,MN_IS_FIELD) \
      template(java_lang_invoke_MemberName,MN_IS_TYPE) \
+     template(java_lang_invoke_MemberName,MN_CALLER_SENSITIVE) \
      template(java_lang_invoke_MemberName,MN_SEARCH_SUPERCLASSES) \
      template(java_lang_invoke_MemberName,MN_SEARCH_INTERFACES) \
      template(java_lang_invoke_MemberName,MN_REFERENCE_KIND_SHIFT) \
      template(java_lang_invoke_MemberName,MN_REFERENCE_KIND_MASK) \
      template(MethodHandles,GC_LAMBDA_SUPPORT) \