src/share/vm/classfile/javaClasses.cpp

rev 2143 : 6839872: remove implementation inheritance from JSR 292 APIs
Summary: Move all JSR 292 classes into the java.dyn package.
Reviewed-by:

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 64,73 ****
--- 64,95 ----
      return ik->find_field(name_symbol, signature_symbol, fd) != NULL;
    else
      return ik->find_local_field(name_symbol, signature_symbol, fd);
  }
  
+ static bool find_hacked_field(instanceKlass* ik,
+                               Symbol* name_symbol, Symbol* signature_symbol,
+                               fieldDescriptor* fd,
+                               bool allow_super = false) {
+   bool found = find_field(ik, name_symbol, signature_symbol, fd, allow_super);
+   if (!found && AllowTransitionalJSR292) {
+     Symbol* backup_sig = SystemDictionary::find_backup_signature(signature_symbol);
+     if (backup_sig != NULL) {
+       found = find_field(ik, name_symbol, backup_sig, fd, allow_super);
+       if (TraceMethodHandles) {
+         ResourceMark rm;
+         tty->print_cr("MethodHandles: %s.%s: backup for %s => %s%s",
+                       ik->name()->as_C_string(), name_symbol->as_C_string(),
+                       signature_symbol->as_C_string(), backup_sig->as_C_string(),
+                       (found ? "" : " (NOT FOUND)"));
+       }
+     }
+   }
+   return found;
+ }
+ #define find_field find_hacked_field  /* remove after AllowTransitionalJSR292 */
+ 
  // Helpful routine for computing field offsets at run time rather than hardcoding them
  static void
  compute_offset(int &dest_offset,
                 klassOop klass_oop, Symbol* name_symbol, Symbol* signature_symbol,
                 bool allow_super = false) {
*** 2198,2214 ****
  int sun_dyn_AdapterMethodHandle::_conversion_offset;
  
  void java_dyn_MethodHandle::compute_offsets() {
    klassOop k = SystemDictionary::MethodHandle_klass();
    if (k != NULL && EnableMethodHandles) {
!     compute_offset(_type_offset,      k, vmSymbols::type_name(),      vmSymbols::java_dyn_MethodType_signature(), true);
!     compute_offset(_vmtarget_offset,  k, vmSymbols::vmtarget_name(),  vmSymbols::object_signature(), true);
!     compute_offset(_vmentry_offset,   k, vmSymbols::vmentry_name(),   vmSymbols::machine_word_signature(), true);
  
      // Note:  MH.vmslots (if it is present) is a hoisted copy of MH.type.form.vmslots.
      // It is optional pending experiments to keep or toss.
!     compute_optional_offset(_vmslots_offset, k, vmSymbols::vmslots_name(), vmSymbols::int_signature(), true);
    }
  }
  
  void sun_dyn_MemberName::compute_offsets() {
    klassOop k = SystemDictionary::MemberName_klass();
--- 2220,2238 ----
  int sun_dyn_AdapterMethodHandle::_conversion_offset;
  
  void java_dyn_MethodHandle::compute_offsets() {
    klassOop k = SystemDictionary::MethodHandle_klass();
    if (k != NULL && EnableMethodHandles) {
!     bool allow_super = false;
!     if (AllowTransitionalJSR292)  allow_super = true;  // temporary, to access sun.dyn.MethodHandleImpl
!     compute_offset(_type_offset,      k, vmSymbols::type_name(),      vmSymbols::java_dyn_MethodType_signature(), allow_super);
!     compute_offset(_vmtarget_offset,  k, vmSymbols::vmtarget_name(),  vmSymbols::object_signature(), allow_super);
!     compute_offset(_vmentry_offset,   k, vmSymbols::vmentry_name(),   vmSymbols::machine_word_signature(), allow_super);
  
      // Note:  MH.vmslots (if it is present) is a hoisted copy of MH.type.form.vmslots.
      // It is optional pending experiments to keep or toss.
!     compute_optional_offset(_vmslots_offset, k, vmSymbols::vmslots_name(), vmSymbols::int_signature(), allow_super);
    }
  }
  
  void sun_dyn_MemberName::compute_offsets() {
    klassOop k = SystemDictionary::MemberName_klass();
*** 2502,2521 ****
  
  
  // Support for java_dyn_CallSite
  
  int java_dyn_CallSite::_target_offset;
- int java_dyn_CallSite::_caller_method_offset;
- int java_dyn_CallSite::_caller_bci_offset;
  
  void java_dyn_CallSite::compute_offsets() {
    if (!EnableInvokeDynamic)  return;
    klassOop k = SystemDictionary::CallSite_klass();
    if (k != NULL) {
      compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_dyn_MethodHandle_signature());
-     compute_offset(_caller_method_offset, k, vmSymbols::vmmethod_name(), vmSymbols::sun_dyn_MemberName_signature());
-     compute_offset(_caller_bci_offset, k, vmSymbols::vmindex_name(), vmSymbols::int_signature());
    }
  }
  
  oop java_dyn_CallSite::target(oop site) {
    return site->obj_field(_target_offset);
--- 2526,2541 ----
*** 2523,2548 ****
  
  void java_dyn_CallSite::set_target(oop site, oop target) {
    site->obj_field_put(_target_offset, target);
  }
  
- oop java_dyn_CallSite::caller_method(oop site) {
-   return site->obj_field(_caller_method_offset);
- }
- 
- void java_dyn_CallSite::set_caller_method(oop site, oop ref) {
-   site->obj_field_put(_caller_method_offset, ref);
- }
- 
- jint java_dyn_CallSite::caller_bci(oop site) {
-   return site->int_field(_caller_bci_offset);
- }
- 
- void java_dyn_CallSite::set_caller_bci(oop site, jint bci) {
-   site->int_field_put(_caller_bci_offset, bci);
- }
- 
  
  // Support for java_security_AccessControlContext
  
  int java_security_AccessControlContext::_context_offset = 0;
  int java_security_AccessControlContext::_privilegedContext_offset = 0;
--- 2543,2552 ----