hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
author coleenp
Mon, 12 Aug 2013 17:24:54 -0400
changeset 19278 c4355bebb414
parent 18940 d39d4765e6cb
child 19326 14cb6cf26a96
permissions -rw-r--r--
8009728: nsk/jvmti/AttachOnDemand/attach030 crashes on Win32 Summary: ActiveMethodOopsCache was used to keep track of old versions of some methods that are cached in Universe but is buggy with permgen removal and not needed anymore Reviewed-by: sspitsyn, dcubed, mseledtsov
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
     2
 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
5547
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f4b087cbb361 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 4571
diff changeset
    21
 * questions.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    25
#include "precompiled.hpp"
15430
7c35f12cf1e5 8006040: NPG: on_stack processing wastes space in ConstantPool
coleenp
parents: 15229
diff changeset
    26
#include "classfile/metadataOnStackMark.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    27
#include "classfile/systemDictionary.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    28
#include "classfile/verifier.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    29
#include "code/codeCache.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    30
#include "compiler/compileBroker.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    31
#include "interpreter/oopMapCache.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    32
#include "interpreter/rewriter.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    33
#include "memory/gcLocker.hpp"
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    34
#include "memory/metadataFactory.hpp"
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    35
#include "memory/metaspaceShared.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    36
#include "memory/universe.inline.hpp"
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
    37
#include "oops/fieldStreams.hpp"
7397
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    38
#include "oops/klassVtable.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    39
#include "prims/jvmtiImpl.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    40
#include "prims/jvmtiRedefineClasses.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    41
#include "prims/methodComparator.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    42
#include "runtime/deoptimization.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    43
#include "runtime/relocator.hpp"
5b173b4ca846 6989984: Use standard include model for Hospot
stefank
parents: 5547
diff changeset
    44
#include "utilities/bitMap.inline.hpp"
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    45
489c9b5090e2 Initial load
duke
parents:
diff changeset
    46
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    47
Array<Method*>* VM_RedefineClasses::_old_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    48
Array<Method*>* VM_RedefineClasses::_new_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    49
Method**  VM_RedefineClasses::_matching_old_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    50
Method**  VM_RedefineClasses::_matching_new_methods = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    51
Method**  VM_RedefineClasses::_deleted_methods      = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    52
Method**  VM_RedefineClasses::_added_methods        = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    53
int         VM_RedefineClasses::_matching_methods_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    54
int         VM_RedefineClasses::_deleted_methods_length  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    55
int         VM_RedefineClasses::_added_methods_length    = 0;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
    56
Klass*      VM_RedefineClasses::_the_class_oop = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
    57
489c9b5090e2 Initial load
duke
parents:
diff changeset
    58
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
VM_RedefineClasses::VM_RedefineClasses(jint class_count,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    60
                                       const jvmtiClassDefinition *class_defs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    61
                                       JvmtiClassLoadKind class_load_kind) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    62
  _class_count = class_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    63
  _class_defs = class_defs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    64
  _class_load_kind = class_load_kind;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    65
  _res = JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    66
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
    67
489c9b5090e2 Initial load
duke
parents:
diff changeset
    68
bool VM_RedefineClasses::doit_prologue() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    69
  if (_class_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    70
    _res = JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    71
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    72
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
  if (_class_defs == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
    _res = JVMTI_ERROR_NULL_POINTER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    75
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    77
  for (int i = 0; i < _class_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    78
    if (_class_defs[i].klass == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    79
      _res = JVMTI_ERROR_INVALID_CLASS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    80
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
    if (_class_defs[i].class_byte_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
      _res = JVMTI_ERROR_INVALID_CLASS_FORMAT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    84
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    86
    if (_class_defs[i].class_bytes == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    87
      _res = JVMTI_ERROR_NULL_POINTER;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
  // Start timer after all the sanity checks; not quite accurate, but
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
  // better than adding a bunch of stop() calls.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
  RC_TIMER_START(_timer_vm_op_prologue);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
489c9b5090e2 Initial load
duke
parents:
diff changeset
    96
  // We first load new class versions in the prologue, because somewhere down the
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
  // call chain it is required that the current thread is a Java thread.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
  _res = load_new_class_versions(Thread::current());
489c9b5090e2 Initial load
duke
parents:
diff changeset
    99
  if (_res != JVMTI_ERROR_NONE) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   100
    // free any successfully created classes, since none are redefined
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   101
    for (int i = 0; i < _class_count; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   102
      if (_scratch_classes[i] != NULL) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   103
        ClassLoaderData* cld = _scratch_classes[i]->class_loader_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   104
        // Free the memory for this class at class unloading time.  Not before
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   105
        // because CMS might think this is still live.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   106
        cld->add_to_deallocate_list((InstanceKlass*)_scratch_classes[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   107
      }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   108
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   109
    // Free os::malloc allocated memory in load_new_class_version.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   110
    os::free(_scratch_classes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   111
    RC_TIMER_STOP(_timer_vm_op_prologue);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   112
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   113
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   114
489c9b5090e2 Initial load
duke
parents:
diff changeset
   115
  RC_TIMER_STOP(_timer_vm_op_prologue);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   116
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   117
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   118
489c9b5090e2 Initial load
duke
parents:
diff changeset
   119
void VM_RedefineClasses::doit() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
  Thread *thread = Thread::current();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
  if (UseSharedSpaces) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   123
    // Sharing is enabled so we remap the shared readonly space to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   124
    // shared readwrite, private just in case we need to redefine
489c9b5090e2 Initial load
duke
parents:
diff changeset
   125
    // a shared class. We do the remap during the doit() phase of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   126
    // the safepoint to be safer.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   127
    if (!MetaspaceShared::remap_shared_readonly_as_readwrite()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   128
      RC_TRACE_WITH_THREAD(0x00000001, thread,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   129
        ("failed to remap shared readonly space to readwrite, private"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   130
      _res = JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   131
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   132
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   133
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   134
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   135
  // Mark methods seen on stack and everywhere else so old methods are not
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   136
  // cleaned up if they're on the stack.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   137
  MetadataOnStackMark md_on_stack;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   138
  HandleMark hm(thread);   // make sure any handles created are deleted
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   139
                           // before the stack walk again.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   140
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   141
  for (int i = 0; i < _class_count; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   142
    redefine_single_class(_class_defs[i].klass, _scratch_classes[i], thread);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   143
    ClassLoaderData* cld = _scratch_classes[i]->class_loader_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   144
    // Free the memory for this class at class unloading time.  Not before
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   145
    // because CMS might think this is still live.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   146
    cld->add_to_deallocate_list((InstanceKlass*)_scratch_classes[i]);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   147
    _scratch_classes[i] = NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   148
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   149
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   150
  // Disable any dependent concurrent compilations
489c9b5090e2 Initial load
duke
parents:
diff changeset
   151
  SystemDictionary::notice_modification();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   152
489c9b5090e2 Initial load
duke
parents:
diff changeset
   153
  // Set flag indicating that some invariants are no longer true.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   154
  // See jvmtiExport.hpp for detailed explanation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   155
  JvmtiExport::set_has_redefined_a_class();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   156
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   157
// check_class() is optionally called for product bits, but is
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   158
// always called for non-product bits.
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   159
#ifdef PRODUCT
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   160
  if (RC_TRACE_ENABLED(0x00004000)) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   161
#endif
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   162
    RC_TRACE_WITH_THREAD(0x00004000, thread, ("calling check_class"));
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
   163
    CheckClass check_class(thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
   164
    ClassLoaderDataGraph::classes_do(&check_class);
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   165
#ifdef PRODUCT
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
   166
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   167
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
   168
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   169
489c9b5090e2 Initial load
duke
parents:
diff changeset
   170
void VM_RedefineClasses::doit_epilogue() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   171
  // Free os::malloc allocated memory.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   172
  os::free(_scratch_classes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   173
489c9b5090e2 Initial load
duke
parents:
diff changeset
   174
  if (RC_TRACE_ENABLED(0x00000004)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   175
    // Used to have separate timers for "doit" and "all", but the timer
489c9b5090e2 Initial load
duke
parents:
diff changeset
   176
    // overhead skewed the measurements.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   177
    jlong doit_time = _timer_rsc_phase1.milliseconds() +
489c9b5090e2 Initial load
duke
parents:
diff changeset
   178
                      _timer_rsc_phase2.milliseconds();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   179
    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   180
489c9b5090e2 Initial load
duke
parents:
diff changeset
   181
    RC_TRACE(0x00000004, ("vm_op: all=" UINT64_FORMAT
489c9b5090e2 Initial load
duke
parents:
diff changeset
   182
      "  prologue=" UINT64_FORMAT "  doit=" UINT64_FORMAT, all_time,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   183
      _timer_vm_op_prologue.milliseconds(), doit_time));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   184
    RC_TRACE(0x00000004,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   185
      ("redefine_single_class: phase1=" UINT64_FORMAT "  phase2=" UINT64_FORMAT,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   186
       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   187
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   188
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   189
489c9b5090e2 Initial load
duke
parents:
diff changeset
   190
bool VM_RedefineClasses::is_modifiable_class(oop klass_mirror) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   191
  // classes for primitives cannot be redefined
489c9b5090e2 Initial load
duke
parents:
diff changeset
   192
  if (java_lang_Class::is_primitive(klass_mirror)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   193
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   194
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   195
  Klass* the_class_oop = java_lang_Class::as_Klass(klass_mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   196
  // classes for arrays cannot be redefined
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   197
  if (the_class_oop == NULL || !the_class_oop->oop_is_instance()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   198
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   199
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   200
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   201
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   202
489c9b5090e2 Initial load
duke
parents:
diff changeset
   203
// Append the current entry at scratch_i in scratch_cp to *merge_cp_p
489c9b5090e2 Initial load
duke
parents:
diff changeset
   204
// where the end of *merge_cp_p is specified by *merge_cp_length_p. For
489c9b5090e2 Initial load
duke
parents:
diff changeset
   205
// direct CP entries, there is just the current entry to append. For
489c9b5090e2 Initial load
duke
parents:
diff changeset
   206
// indirect and double-indirect CP entries, there are zero or more
489c9b5090e2 Initial load
duke
parents:
diff changeset
   207
// referenced CP entries along with the current entry to append.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   208
// Indirect and double-indirect CP entries are handled by recursive
489c9b5090e2 Initial load
duke
parents:
diff changeset
   209
// calls to append_entry() as needed. The referenced CP entries are
489c9b5090e2 Initial load
duke
parents:
diff changeset
   210
// always appended to *merge_cp_p before the referee CP entry. These
489c9b5090e2 Initial load
duke
parents:
diff changeset
   211
// referenced CP entries may already exist in *merge_cp_p in which case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   212
// there is nothing extra to append and only the current entry is
489c9b5090e2 Initial load
duke
parents:
diff changeset
   213
// appended.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   214
void VM_RedefineClasses::append_entry(constantPoolHandle scratch_cp,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   215
       int scratch_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   216
       TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   217
489c9b5090e2 Initial load
duke
parents:
diff changeset
   218
  // append is different depending on entry tag type
489c9b5090e2 Initial load
duke
parents:
diff changeset
   219
  switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   220
489c9b5090e2 Initial load
duke
parents:
diff changeset
   221
    // The old verifier is implemented outside the VM. It loads classes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   222
    // but does not resolve constant pool entries directly so we never
489c9b5090e2 Initial load
duke
parents:
diff changeset
   223
    // see Class entries here with the old verifier. Similarly the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
   224
    // verifier does not like Class entries in the input constant pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   225
    // The split-verifier is implemented in the VM so it can optionally
489c9b5090e2 Initial load
duke
parents:
diff changeset
   226
    // and directly resolve constant pool entries to load classes. The
489c9b5090e2 Initial load
duke
parents:
diff changeset
   227
    // split-verifier can accept either Class entries or UnresolvedClass
489c9b5090e2 Initial load
duke
parents:
diff changeset
   228
    // entries in the input constant pool. We revert the appended copy
489c9b5090e2 Initial load
duke
parents:
diff changeset
   229
    // back to UnresolvedClass so that either verifier will be happy
489c9b5090e2 Initial load
duke
parents:
diff changeset
   230
    // with the constant pool entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   231
    case JVM_CONSTANT_Class:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   232
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   233
      // revert the copy to JVM_CONSTANT_UnresolvedClass
489c9b5090e2 Initial load
duke
parents:
diff changeset
   234
      (*merge_cp_p)->unresolved_klass_at_put(*merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   235
        scratch_cp->klass_name_at(scratch_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   236
489c9b5090e2 Initial load
duke
parents:
diff changeset
   237
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   238
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   239
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   240
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   241
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   242
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   243
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   244
489c9b5090e2 Initial load
duke
parents:
diff changeset
   245
    // these are direct CP entries so they can be directly appended,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   246
    // but double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
   247
    case JVM_CONSTANT_Double:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   248
    case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   249
    {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   250
      ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   251
        THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   252
489c9b5090e2 Initial load
duke
parents:
diff changeset
   253
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   254
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   255
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   256
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   257
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   258
      (*merge_cp_length_p) += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   259
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   260
489c9b5090e2 Initial load
duke
parents:
diff changeset
   261
    // these are direct CP entries so they can be directly appended
489c9b5090e2 Initial load
duke
parents:
diff changeset
   262
    case JVM_CONSTANT_Float:   // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   263
    case JVM_CONSTANT_Integer: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   264
    case JVM_CONSTANT_Utf8:    // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   265
489c9b5090e2 Initial load
duke
parents:
diff changeset
   266
    // This was an indirect CP entry, but it has been changed into
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   267
    // Symbol*s so this entry can be directly appended.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   268
    case JVM_CONSTANT_String:      // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   269
489c9b5090e2 Initial load
duke
parents:
diff changeset
   270
    // These were indirect CP entries, but they have been changed into
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
   271
    // Symbol*s so these entries can be directly appended.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   272
    case JVM_CONSTANT_UnresolvedClass:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   273
    {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   274
      ConstantPool::copy_entry_to(scratch_cp, scratch_i, *merge_cp_p, *merge_cp_length_p,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   275
        THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   276
489c9b5090e2 Initial load
duke
parents:
diff changeset
   277
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   278
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   279
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   280
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   281
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   282
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   283
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   284
489c9b5090e2 Initial load
duke
parents:
diff changeset
   285
    // this is an indirect CP entry so it needs special handling
489c9b5090e2 Initial load
duke
parents:
diff changeset
   286
    case JVM_CONSTANT_NameAndType:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   287
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   288
      int name_ref_i = scratch_cp->name_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   289
      int new_name_ref_i = find_or_append_indirect_entry(scratch_cp, name_ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   290
                                                         merge_cp_length_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   291
489c9b5090e2 Initial load
duke
parents:
diff changeset
   292
      int signature_ref_i = scratch_cp->signature_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   293
      int new_signature_ref_i = find_or_append_indirect_entry(scratch_cp, signature_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   294
                                                              merge_cp_p, merge_cp_length_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   295
                                                              THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   296
489c9b5090e2 Initial load
duke
parents:
diff changeset
   297
      // If the referenced entries already exist in *merge_cp_p, then
489c9b5090e2 Initial load
duke
parents:
diff changeset
   298
      // both new_name_ref_i and new_signature_ref_i will both be 0.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   299
      // In that case, all we are appending is the current entry.
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   300
      if (new_name_ref_i != name_ref_i) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   301
        RC_TRACE(0x00080000,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   302
          ("NameAndType entry@%d name_ref_index change: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   303
          *merge_cp_length_p, name_ref_i, new_name_ref_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   304
      }
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   305
      if (new_signature_ref_i != signature_ref_i) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   306
        RC_TRACE(0x00080000,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   307
          ("NameAndType entry@%d signature_ref_index change: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   308
          *merge_cp_length_p, signature_ref_i, new_signature_ref_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   309
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   310
489c9b5090e2 Initial load
duke
parents:
diff changeset
   311
      (*merge_cp_p)->name_and_type_at_put(*merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   312
        new_name_ref_i, new_signature_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   313
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   314
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   315
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   316
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   317
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   318
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   319
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   320
489c9b5090e2 Initial load
duke
parents:
diff changeset
   321
    // this is a double-indirect CP entry so it needs special handling
489c9b5090e2 Initial load
duke
parents:
diff changeset
   322
    case JVM_CONSTANT_Fieldref:           // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   323
    case JVM_CONSTANT_InterfaceMethodref: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   324
    case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   325
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   326
      int klass_ref_i = scratch_cp->uncached_klass_ref_index_at(scratch_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   327
      int new_klass_ref_i = find_or_append_indirect_entry(scratch_cp, klass_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   328
                                                          merge_cp_p, merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   329
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   330
      int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   331
      int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   332
                                                          merge_cp_p, merge_cp_length_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   333
489c9b5090e2 Initial load
duke
parents:
diff changeset
   334
      const char *entry_name;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   335
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   336
      case JVM_CONSTANT_Fieldref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   337
        entry_name = "Fieldref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   338
        (*merge_cp_p)->field_at_put(*merge_cp_length_p, new_klass_ref_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   339
          new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   340
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   341
      case JVM_CONSTANT_InterfaceMethodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   342
        entry_name = "IFMethodref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   343
        (*merge_cp_p)->interface_method_at_put(*merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   344
          new_klass_ref_i, new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   345
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   346
      case JVM_CONSTANT_Methodref:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   347
        entry_name = "Methodref";
489c9b5090e2 Initial load
duke
parents:
diff changeset
   348
        (*merge_cp_p)->method_at_put(*merge_cp_length_p, new_klass_ref_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   349
          new_name_and_type_ref_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   350
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   351
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   352
        guarantee(false, "bad switch");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   353
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   354
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   355
489c9b5090e2 Initial load
duke
parents:
diff changeset
   356
      if (klass_ref_i != new_klass_ref_i) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   357
        RC_TRACE(0x00080000, ("%s entry@%d class_index changed: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   358
          entry_name, *merge_cp_length_p, klass_ref_i, new_klass_ref_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   359
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   360
      if (name_and_type_ref_i != new_name_and_type_ref_i) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   361
        RC_TRACE(0x00080000,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   362
          ("%s entry@%d name_and_type_index changed: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   363
          entry_name, *merge_cp_length_p, name_and_type_ref_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   364
          new_name_and_type_ref_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   365
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   366
489c9b5090e2 Initial load
duke
parents:
diff changeset
   367
      if (scratch_i != *merge_cp_length_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   368
        // The new entry in *merge_cp_p is at a different index than
489c9b5090e2 Initial load
duke
parents:
diff changeset
   369
        // the new entry in scratch_cp so we need to map the index values.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   370
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   371
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   372
      (*merge_cp_length_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   373
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   374
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   375
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   376
    case JVM_CONSTANT_MethodType:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   377
    {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   378
      int ref_i = scratch_cp->method_type_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   379
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   380
                                                    merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   381
      if (new_ref_i != ref_i) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   382
        RC_TRACE(0x00080000,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   383
                 ("MethodType entry@%d ref_index change: %d to %d",
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   384
                  *merge_cp_length_p, ref_i, new_ref_i));
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   385
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   386
      (*merge_cp_p)->method_type_index_at_put(*merge_cp_length_p, new_ref_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   387
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   388
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   389
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   390
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   391
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   392
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   393
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   394
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   395
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   396
    case JVM_CONSTANT_MethodHandle:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   397
    {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   398
      int ref_kind = scratch_cp->method_handle_ref_kind_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   399
      int ref_i = scratch_cp->method_handle_index_at(scratch_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   400
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, ref_i, merge_cp_p,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   401
                                                    merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   402
      if (new_ref_i != ref_i) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   403
        RC_TRACE(0x00080000,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   404
                 ("MethodHandle entry@%d ref_index change: %d to %d",
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   405
                  *merge_cp_length_p, ref_i, new_ref_i));
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   406
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   407
      (*merge_cp_p)->method_handle_index_at_put(*merge_cp_length_p, ref_kind, new_ref_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   408
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   409
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   410
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   411
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   412
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   413
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   414
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   415
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   416
    // this is an indirect CP entry so it needs special handling
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   417
    case JVM_CONSTANT_InvokeDynamic:
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   418
    {
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   419
      // Index of the bootstrap specifier in the operands array
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   420
      int old_bs_i = scratch_cp->invoke_dynamic_bootstrap_specifier_index(scratch_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   421
      int new_bs_i = find_or_append_operand(scratch_cp, old_bs_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   422
                                            merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   423
      // The bootstrap method NameAndType_info index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   424
      int old_ref_i = scratch_cp->invoke_dynamic_name_and_type_ref_index_at(scratch_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   425
      int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   426
                                                    merge_cp_length_p, THREAD);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   427
      if (new_bs_i != old_bs_i) {
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   428
        RC_TRACE(0x00080000,
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   429
                 ("InvokeDynamic entry@%d bootstrap_method_attr_index change: %d to %d",
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   430
                  *merge_cp_length_p, old_bs_i, new_bs_i));
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   431
      }
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   432
      if (new_ref_i != old_ref_i) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   433
        RC_TRACE(0x00080000,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   434
                 ("InvokeDynamic entry@%d name_and_type_index change: %d to %d",
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   435
                  *merge_cp_length_p, old_ref_i, new_ref_i));
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   436
      }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   437
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   438
      (*merge_cp_p)->invoke_dynamic_at_put(*merge_cp_length_p, new_bs_i, new_ref_i);
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   439
      if (scratch_i != *merge_cp_length_p) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   440
        // The new entry in *merge_cp_p is at a different index than
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   441
        // the new entry in scratch_cp so we need to map the index values.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   442
        map_index(scratch_cp, scratch_i, *merge_cp_length_p);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   443
      }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   444
      (*merge_cp_length_p)++;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   445
    } break;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   446
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   447
    // At this stage, Class or UnresolvedClass could be here, but not
489c9b5090e2 Initial load
duke
parents:
diff changeset
   448
    // ClassIndex
489c9b5090e2 Initial load
duke
parents:
diff changeset
   449
    case JVM_CONSTANT_ClassIndex: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   450
489c9b5090e2 Initial load
duke
parents:
diff changeset
   451
    // Invalid is used as the tag for the second constant pool entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
   452
    // occupied by JVM_CONSTANT_Double or JVM_CONSTANT_Long. It should
489c9b5090e2 Initial load
duke
parents:
diff changeset
   453
    // not be seen by itself.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   454
    case JVM_CONSTANT_Invalid: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   455
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   456
    // At this stage, String could be here, but not StringIndex
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   457
    case JVM_CONSTANT_StringIndex: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   458
489c9b5090e2 Initial load
duke
parents:
diff changeset
   459
    // At this stage JVM_CONSTANT_UnresolvedClassInError should not be
489c9b5090e2 Initial load
duke
parents:
diff changeset
   460
    // here
489c9b5090e2 Initial load
duke
parents:
diff changeset
   461
    case JVM_CONSTANT_UnresolvedClassInError: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
   462
489c9b5090e2 Initial load
duke
parents:
diff changeset
   463
    default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   464
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   465
      // leave a breadcrumb
489c9b5090e2 Initial load
duke
parents:
diff changeset
   466
      jbyte bad_value = scratch_cp->tag_at(scratch_i).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   467
      ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   468
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   469
  } // end switch tag value
489c9b5090e2 Initial load
duke
parents:
diff changeset
   470
} // end append_entry()
489c9b5090e2 Initial load
duke
parents:
diff changeset
   471
489c9b5090e2 Initial load
duke
parents:
diff changeset
   472
15444
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   473
int VM_RedefineClasses::find_or_append_indirect_entry(constantPoolHandle scratch_cp,
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   474
      int ref_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   475
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   476
  int new_ref_i = ref_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   477
  bool match = (ref_i < *merge_cp_length_p) &&
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   478
               scratch_cp->compare_entry_to(ref_i, *merge_cp_p, ref_i, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   479
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   480
  if (!match) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   481
    // forward reference in *merge_cp_p or not a direct match
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   482
    int found_i = scratch_cp->find_matching_entry(ref_i, *merge_cp_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   483
    if (found_i != 0) {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   484
      guarantee(found_i != ref_i, "compare_entry_to() and find_matching_entry() do not agree");
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   485
      // Found a matching entry somewhere else in *merge_cp_p so just need a mapping entry.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   486
      new_ref_i = found_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   487
      map_index(scratch_cp, ref_i, found_i);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   488
    } else {
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   489
      // no match found so we have to append this entry to *merge_cp_p
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   490
      append_entry(scratch_cp, ref_i, merge_cp_p, merge_cp_length_p, THREAD);
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   491
      // The above call to append_entry() can only append one entry
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   492
      // so the post call query of *merge_cp_length_p is only for
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   493
      // the sake of consistency.
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   494
      new_ref_i = *merge_cp_length_p - 1;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   495
    }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   496
  }
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   497
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   498
  return new_ref_i;
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   499
} // end find_or_append_indirect_entry()
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   500
ab03781780dc 8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
sspitsyn
parents: 15435
diff changeset
   501
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   502
// Append a bootstrap specifier into the merge_cp operands that is semantically equal
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   503
// to the scratch_cp operands bootstrap specifier passed by the old_bs_i index.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   504
// Recursively append new merge_cp entries referenced by the new bootstrap specifier.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   505
void VM_RedefineClasses::append_operand(constantPoolHandle scratch_cp, int old_bs_i,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   506
       constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   507
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   508
  int old_ref_i = scratch_cp->operand_bootstrap_method_ref_index_at(old_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   509
  int new_ref_i = find_or_append_indirect_entry(scratch_cp, old_ref_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   510
                                                merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   511
  if (new_ref_i != old_ref_i) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   512
    RC_TRACE(0x00080000,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   513
             ("operands entry@%d bootstrap method ref_index change: %d to %d",
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   514
              _operands_cur_length, old_ref_i, new_ref_i));
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   515
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   516
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   517
  Array<u2>* merge_ops = (*merge_cp_p)->operands();
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   518
  int new_bs_i = _operands_cur_length;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   519
  // We have _operands_cur_length == 0 when the merge_cp operands is empty yet.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   520
  // However, the operand_offset_at(0) was set in the extend_operands() call.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   521
  int new_base = (new_bs_i == 0) ? (*merge_cp_p)->operand_offset_at(0)
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   522
                                 : (*merge_cp_p)->operand_next_offset_at(new_bs_i - 1);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   523
  int argc     = scratch_cp->operand_argument_count_at(old_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   524
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   525
  ConstantPool::operand_offset_at_put(merge_ops, _operands_cur_length, new_base);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   526
  merge_ops->at_put(new_base++, new_ref_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   527
  merge_ops->at_put(new_base++, argc);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   528
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   529
  for (int i = 0; i < argc; i++) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   530
    int old_arg_ref_i = scratch_cp->operand_argument_index_at(old_bs_i, i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   531
    int new_arg_ref_i = find_or_append_indirect_entry(scratch_cp, old_arg_ref_i, merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   532
                                                      merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   533
    merge_ops->at_put(new_base++, new_arg_ref_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   534
    if (new_arg_ref_i != old_arg_ref_i) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   535
      RC_TRACE(0x00080000,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   536
               ("operands entry@%d bootstrap method argument ref_index change: %d to %d",
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   537
                _operands_cur_length, old_arg_ref_i, new_arg_ref_i));
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   538
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   539
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   540
  if (old_bs_i != _operands_cur_length) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   541
    // The bootstrap specifier in *merge_cp_p is at a different index than
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   542
    // that in scratch_cp so we need to map the index values.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   543
    map_operand_index(old_bs_i, new_bs_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   544
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   545
  _operands_cur_length++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   546
} // end append_operand()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   547
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   548
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   549
int VM_RedefineClasses::find_or_append_operand(constantPoolHandle scratch_cp,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   550
      int old_bs_i, constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   551
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   552
  int new_bs_i = old_bs_i; // bootstrap specifier index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   553
  bool match = (old_bs_i < _operands_cur_length) &&
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   554
               scratch_cp->compare_operand_to(old_bs_i, *merge_cp_p, old_bs_i, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   555
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   556
  if (!match) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   557
    // forward reference in *merge_cp_p or not a direct match
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   558
    int found_i = scratch_cp->find_matching_operand(old_bs_i, *merge_cp_p,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   559
                                                    _operands_cur_length, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   560
    if (found_i != -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   561
      guarantee(found_i != old_bs_i, "compare_operand_to() and find_matching_operand() disagree");
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   562
      // found a matching operand somewhere else in *merge_cp_p so just need a mapping
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   563
      new_bs_i = found_i;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   564
      map_operand_index(old_bs_i, found_i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   565
    } else {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   566
      // no match found so we have to append this bootstrap specifier to *merge_cp_p
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   567
      append_operand(scratch_cp, old_bs_i, merge_cp_p, merge_cp_length_p, THREAD);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   568
      new_bs_i = _operands_cur_length - 1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   569
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   570
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   571
  return new_bs_i;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   572
} // end find_or_append_operand()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   573
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   574
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   575
void VM_RedefineClasses::finalize_operands_merge(constantPoolHandle merge_cp, TRAPS) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   576
  if (merge_cp->operands() == NULL) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   577
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   578
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   579
  // Shrink the merge_cp operands
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   580
  merge_cp->shrink_operands(_operands_cur_length, CHECK);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   581
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   582
  if (RC_TRACE_ENABLED(0x00040000)) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   583
    // don't want to loop unless we are tracing
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   584
    int count = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   585
    for (int i = 1; i < _operands_index_map_p->length(); i++) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   586
      int value = _operands_index_map_p->at(i);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   587
      if (value != -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   588
        RC_TRACE_WITH_THREAD(0x00040000, THREAD,
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   589
          ("operands_index_map[%d]: old=%d new=%d", count, i, value));
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   590
        count++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   591
      }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   592
    }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   593
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   594
  // Clean-up
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   595
  _operands_index_map_p = NULL;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   596
  _operands_cur_length = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   597
  _operands_index_map_count = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   598
} // end finalize_operands_merge()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   599
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   600
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   601
jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions(
489c9b5090e2 Initial load
duke
parents:
diff changeset
   602
             instanceKlassHandle the_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   603
             instanceKlassHandle scratch_class) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   604
  int i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   605
489c9b5090e2 Initial load
duke
parents:
diff changeset
   606
  // Check superclasses, or rather their names, since superclasses themselves can be
489c9b5090e2 Initial load
duke
parents:
diff changeset
   607
  // requested to replace.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   608
  // Check for NULL superclass first since this might be java.lang.Object
489c9b5090e2 Initial load
duke
parents:
diff changeset
   609
  if (the_class->super() != scratch_class->super() &&
489c9b5090e2 Initial load
duke
parents:
diff changeset
   610
      (the_class->super() == NULL || scratch_class->super() == NULL ||
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   611
       the_class->super()->name() !=
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   612
       scratch_class->super()->name())) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   613
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   614
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   615
489c9b5090e2 Initial load
duke
parents:
diff changeset
   616
  // Check if the number, names and order of directly implemented interfaces are the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   617
  // I think in principle we should just check if the sets of names of directly implemented
489c9b5090e2 Initial load
duke
parents:
diff changeset
   618
  // interfaces are the same, i.e. the order of declaration (which, however, if changed in the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   619
  // .java file, also changes in .class file) should not matter. However, comparing sets is
489c9b5090e2 Initial load
duke
parents:
diff changeset
   620
  // technically a bit more difficult, and, more importantly, I am not sure at present that the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   621
  // order of interfaces does not matter on the implementation level, i.e. that the VM does not
489c9b5090e2 Initial load
duke
parents:
diff changeset
   622
  // rely on it somewhere.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   623
  Array<Klass*>* k_interfaces = the_class->local_interfaces();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   624
  Array<Klass*>* k_new_interfaces = scratch_class->local_interfaces();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   625
  int n_intfs = k_interfaces->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   626
  if (n_intfs != k_new_interfaces->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   627
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   628
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   629
  for (i = 0; i < n_intfs; i++) {
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   630
    if (k_interfaces->at(i)->name() !=
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
   631
        k_new_interfaces->at(i)->name()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   632
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_HIERARCHY_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   633
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   634
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   635
489c9b5090e2 Initial load
duke
parents:
diff changeset
   636
  // Check whether class is in the error init state.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   637
  if (the_class->is_in_error_state()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   638
    // TBD #5057930: special error code is needed in 1.6
489c9b5090e2 Initial load
duke
parents:
diff changeset
   639
    return JVMTI_ERROR_INVALID_CLASS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   640
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   641
489c9b5090e2 Initial load
duke
parents:
diff changeset
   642
  // Check whether class modifiers are the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   643
  jushort old_flags = (jushort) the_class->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   644
  jushort new_flags = (jushort) scratch_class->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   645
  if (old_flags != new_flags) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   646
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   647
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   648
489c9b5090e2 Initial load
duke
parents:
diff changeset
   649
  // Check if the number, names, types and order of fields declared in these classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
   650
  // are the same.
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   651
  JavaFieldStream old_fs(the_class);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   652
  JavaFieldStream new_fs(scratch_class);
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   653
  for (; !old_fs.done() && !new_fs.done(); old_fs.next(), new_fs.next()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   654
    // access
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   655
    old_flags = old_fs.access_flags().as_short();
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   656
    new_flags = new_fs.access_flags().as_short();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   657
    if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   658
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   659
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   660
    // offset
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   661
    if (old_fs.offset() != new_fs.offset()) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   662
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   663
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   664
    // name and signature
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   665
    Symbol* name_sym1 = the_class->constants()->symbol_at(old_fs.name_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   666
    Symbol* sig_sym1 = the_class->constants()->symbol_at(old_fs.signature_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   667
    Symbol* name_sym2 = scratch_class->constants()->symbol_at(new_fs.name_index());
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   668
    Symbol* sig_sym2 = scratch_class->constants()->symbol_at(new_fs.signature_index());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   669
    if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   670
      return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   671
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   672
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   673
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   674
  // If both streams aren't done then we have a differing number of
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   675
  // fields.
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   676
  if (!old_fs.done() || !new_fs.done()) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   677
    return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   678
  }
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
   679
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   680
  // Do a parallel walk through the old and new methods. Detect
489c9b5090e2 Initial load
duke
parents:
diff changeset
   681
  // cases where they match (exist in both), have been added in
489c9b5090e2 Initial load
duke
parents:
diff changeset
   682
  // the new methods, or have been deleted (exist only in the
489c9b5090e2 Initial load
duke
parents:
diff changeset
   683
  // old methods).  The class file parser places methods in order
489c9b5090e2 Initial load
duke
parents:
diff changeset
   684
  // by method name, but does not order overloaded methods by
489c9b5090e2 Initial load
duke
parents:
diff changeset
   685
  // signature.  In order to determine what fate befell the methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   686
  // this code places the overloaded new methods that have matching
489c9b5090e2 Initial load
duke
parents:
diff changeset
   687
  // old methods in the same order as the old methods and places
489c9b5090e2 Initial load
duke
parents:
diff changeset
   688
  // new overloaded methods at the end of overloaded methods of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   689
  // that name. The code for this order normalization is adapted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   690
  // from the algorithm used in InstanceKlass::find_method().
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   691
  // Since we are swapping out of order entries as we find them,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   692
  // we only have to search forward through the overloaded methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   693
  // Methods which are added and have the same name as an existing
489c9b5090e2 Initial load
duke
parents:
diff changeset
   694
  // method (but different signature) will be put at the end of
489c9b5090e2 Initial load
duke
parents:
diff changeset
   695
  // the methods with that name, and the name mismatch code will
489c9b5090e2 Initial load
duke
parents:
diff changeset
   696
  // handle them.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   697
  Array<Method*>* k_old_methods(the_class->methods());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   698
  Array<Method*>* k_new_methods(scratch_class->methods());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   699
  int n_old_methods = k_old_methods->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   700
  int n_new_methods = k_new_methods->length();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   701
  Thread* thread = Thread::current();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   702
489c9b5090e2 Initial load
duke
parents:
diff changeset
   703
  int ni = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   704
  int oi = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   705
  while (true) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   706
    Method* k_old_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   707
    Method* k_new_method;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   708
    enum { matched, added, deleted, undetermined } method_was = undetermined;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   709
489c9b5090e2 Initial load
duke
parents:
diff changeset
   710
    if (oi >= n_old_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   711
      if (ni >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   712
        break; // we've looked at everything, done
489c9b5090e2 Initial load
duke
parents:
diff changeset
   713
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   714
      // New method at the end
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   715
      k_new_method = k_new_methods->at(ni);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   716
      method_was = added;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   717
    } else if (ni >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   718
      // Old method, at the end, is deleted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   719
      k_old_method = k_old_methods->at(oi);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   720
      method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   721
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   722
      // There are more methods in both the old and new lists
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   723
      k_old_method = k_old_methods->at(oi);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   724
      k_new_method = k_new_methods->at(ni);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   725
      if (k_old_method->name() != k_new_method->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   726
        // Methods are sorted by method name, so a mismatch means added
489c9b5090e2 Initial load
duke
parents:
diff changeset
   727
        // or deleted
489c9b5090e2 Initial load
duke
parents:
diff changeset
   728
        if (k_old_method->name()->fast_compare(k_new_method->name()) > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   729
          method_was = added;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   730
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   731
          method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   732
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   733
      } else if (k_old_method->signature() == k_new_method->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   734
        // Both the name and signature match
489c9b5090e2 Initial load
duke
parents:
diff changeset
   735
        method_was = matched;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   736
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   737
        // The name matches, but the signature doesn't, which means we have to
489c9b5090e2 Initial load
duke
parents:
diff changeset
   738
        // search forward through the new overloaded methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   739
        int nj;  // outside the loop for post-loop check
489c9b5090e2 Initial load
duke
parents:
diff changeset
   740
        for (nj = ni + 1; nj < n_new_methods; nj++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   741
          Method* m = k_new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   742
          if (k_old_method->name() != m->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   743
            // reached another method name so no more overloaded methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   744
            method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   745
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   746
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   747
          if (k_old_method->signature() == m->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   748
            // found a match so swap the methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   749
            k_new_methods->at_put(ni, m);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   750
            k_new_methods->at_put(nj, k_new_method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   751
            k_new_method = m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   752
            method_was = matched;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   753
            break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   754
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   755
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   756
489c9b5090e2 Initial load
duke
parents:
diff changeset
   757
        if (nj >= n_new_methods) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   758
          // reached the end without a match; so method was deleted
489c9b5090e2 Initial load
duke
parents:
diff changeset
   759
          method_was = deleted;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   760
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   761
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   762
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   763
489c9b5090e2 Initial load
duke
parents:
diff changeset
   764
    switch (method_was) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   765
    case matched:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   766
      // methods match, be sure modifiers do too
489c9b5090e2 Initial load
duke
parents:
diff changeset
   767
      old_flags = (jushort) k_old_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   768
      new_flags = (jushort) k_new_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   769
      if ((old_flags ^ new_flags) & ~(JVM_ACC_NATIVE)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   770
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   771
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   772
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   773
        u2 new_num = k_new_method->method_idnum();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   774
        u2 old_num = k_old_method->method_idnum();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   775
        if (new_num != old_num) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   776
          Method* idnum_owner = scratch_class->method_with_idnum(old_num);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   777
          if (idnum_owner != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   778
            // There is already a method assigned this idnum -- switch them
489c9b5090e2 Initial load
duke
parents:
diff changeset
   779
            idnum_owner->set_method_idnum(new_num);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   780
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   781
          k_new_method->set_method_idnum(old_num);
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   782
          if (thread->has_pending_exception()) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   783
            return JVMTI_ERROR_OUT_OF_MEMORY;
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
   784
          }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   785
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   786
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   787
      RC_TRACE(0x00008000, ("Method matched: new: %s [%d] == old: %s [%d]",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   788
                            k_new_method->name_and_sig_as_C_string(), ni,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   789
                            k_old_method->name_and_sig_as_C_string(), oi));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   790
      // advance to next pair of methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   791
      ++oi;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   792
      ++ni;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   793
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   794
    case added:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   795
      // method added, see if it is OK
489c9b5090e2 Initial load
duke
parents:
diff changeset
   796
      new_flags = (jushort) k_new_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   797
      if ((new_flags & JVM_ACC_PRIVATE) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   798
           // hack: private should be treated as final, but alas
489c9b5090e2 Initial load
duke
parents:
diff changeset
   799
          || (new_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   800
         ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   801
        // new methods must be private
489c9b5090e2 Initial load
duke
parents:
diff changeset
   802
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   803
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   804
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   805
        u2 num = the_class->next_method_idnum();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   806
        if (num == ConstMethod::UNSET_IDNUM) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   807
          // cannot add any more methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
   808
          return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_ADDED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   809
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   810
        u2 new_num = k_new_method->method_idnum();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   811
        Method* idnum_owner = scratch_class->method_with_idnum(num);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   812
        if (idnum_owner != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   813
          // There is already a method assigned this idnum -- switch them
489c9b5090e2 Initial load
duke
parents:
diff changeset
   814
          idnum_owner->set_method_idnum(new_num);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   815
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   816
        k_new_method->set_method_idnum(num);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   817
        if (thread->has_pending_exception()) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   818
          return JVMTI_ERROR_OUT_OF_MEMORY;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   819
        }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   820
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   821
      RC_TRACE(0x00008000, ("Method added: new: %s [%d]",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   822
                            k_new_method->name_and_sig_as_C_string(), ni));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   823
      ++ni; // advance to next new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
   824
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   825
    case deleted:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   826
      // method deleted, see if it is OK
489c9b5090e2 Initial load
duke
parents:
diff changeset
   827
      old_flags = (jushort) k_old_method->access_flags().get_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   828
      if ((old_flags & JVM_ACC_PRIVATE) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   829
           // hack: private should be treated as final, but alas
489c9b5090e2 Initial load
duke
parents:
diff changeset
   830
          || (old_flags & (JVM_ACC_FINAL|JVM_ACC_STATIC)) == 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
   831
         ) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   832
        // deleted methods must be private
489c9b5090e2 Initial load
duke
parents:
diff changeset
   833
        return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_DELETED;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   834
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   835
      RC_TRACE(0x00008000, ("Method deleted: old: %s [%d]",
489c9b5090e2 Initial load
duke
parents:
diff changeset
   836
                            k_old_method->name_and_sig_as_C_string(), oi));
489c9b5090e2 Initial load
duke
parents:
diff changeset
   837
      ++oi; // advance to next old method
489c9b5090e2 Initial load
duke
parents:
diff changeset
   838
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   839
    default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
   840
      ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   841
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   842
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   843
489c9b5090e2 Initial load
duke
parents:
diff changeset
   844
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   845
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
   846
489c9b5090e2 Initial load
duke
parents:
diff changeset
   847
489c9b5090e2 Initial load
duke
parents:
diff changeset
   848
// Find new constant pool index value for old constant pool index value
489c9b5090e2 Initial load
duke
parents:
diff changeset
   849
// by seaching the index map. Returns zero (0) if there is no mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
   850
// value for the old constant pool index.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   851
int VM_RedefineClasses::find_new_index(int old_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   852
  if (_index_map_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   853
    // map is empty so nothing can be found
489c9b5090e2 Initial load
duke
parents:
diff changeset
   854
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   855
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   856
489c9b5090e2 Initial load
duke
parents:
diff changeset
   857
  if (old_index < 1 || old_index >= _index_map_p->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   858
    // The old_index is out of range so it is not mapped. This should
489c9b5090e2 Initial load
duke
parents:
diff changeset
   859
    // not happen in regular constant pool merging use, but it can
489c9b5090e2 Initial load
duke
parents:
diff changeset
   860
    // happen if a corrupt annotation is processed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   861
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   862
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   863
489c9b5090e2 Initial load
duke
parents:
diff changeset
   864
  int value = _index_map_p->at(old_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   865
  if (value == -1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   866
    // the old_index is not mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
   867
    return 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   868
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   869
489c9b5090e2 Initial load
duke
parents:
diff changeset
   870
  return value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   871
} // end find_new_index()
489c9b5090e2 Initial load
duke
parents:
diff changeset
   872
489c9b5090e2 Initial load
duke
parents:
diff changeset
   873
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   874
// Find new bootstrap specifier index value for old bootstrap specifier index
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   875
// value by seaching the index map. Returns unused index (-1) if there is
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   876
// no mapped value for the old bootstrap specifier index.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   877
int VM_RedefineClasses::find_new_operand_index(int old_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   878
  if (_operands_index_map_count == 0) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   879
    // map is empty so nothing can be found
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   880
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   881
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   882
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   883
  if (old_index == -1 || old_index >= _operands_index_map_p->length()) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   884
    // The old_index is out of range so it is not mapped.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   885
    // This should not happen in regular constant pool merging use.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   886
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   887
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   888
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   889
  int value = _operands_index_map_p->at(old_index);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   890
  if (value == -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   891
    // the old_index is not mapped
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   892
    return -1;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   893
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   894
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   895
  return value;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   896
} // end find_new_operand_index()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   897
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
   898
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   899
// Returns true if the current mismatch is due to a resolved/unresolved
489c9b5090e2 Initial load
duke
parents:
diff changeset
   900
// class pair. Otherwise, returns false.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   901
bool VM_RedefineClasses::is_unresolved_class_mismatch(constantPoolHandle cp1,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   902
       int index1, constantPoolHandle cp2, int index2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   903
489c9b5090e2 Initial load
duke
parents:
diff changeset
   904
  jbyte t1 = cp1->tag_at(index1).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   905
  if (t1 != JVM_CONSTANT_Class && t1 != JVM_CONSTANT_UnresolvedClass) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   906
    return false;  // wrong entry type; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   907
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   908
489c9b5090e2 Initial load
duke
parents:
diff changeset
   909
  jbyte t2 = cp2->tag_at(index2).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   910
  if (t2 != JVM_CONSTANT_Class && t2 != JVM_CONSTANT_UnresolvedClass) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   911
    return false;  // wrong entry type; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   912
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   913
489c9b5090e2 Initial load
duke
parents:
diff changeset
   914
  if (t1 == t2) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   915
    return false;  // not a mismatch; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   916
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   917
489c9b5090e2 Initial load
duke
parents:
diff changeset
   918
  char *s1 = cp1->klass_name_at(index1)->as_C_string();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   919
  char *s2 = cp2->klass_name_at(index2)->as_C_string();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   920
  if (strcmp(s1, s2) != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   921
    return false;  // strings don't match; not our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   922
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   923
489c9b5090e2 Initial load
duke
parents:
diff changeset
   924
  return true;  // made it through the gauntlet; this is our special case
489c9b5090e2 Initial load
duke
parents:
diff changeset
   925
} // end is_unresolved_class_mismatch()
489c9b5090e2 Initial load
duke
parents:
diff changeset
   926
489c9b5090e2 Initial load
duke
parents:
diff changeset
   927
489c9b5090e2 Initial load
duke
parents:
diff changeset
   928
jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   929
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   930
  // For consistency allocate memory using os::malloc wrapper.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   931
  _scratch_classes = (Klass**)
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   932
    os::malloc(sizeof(Klass*) * _class_count, mtClass);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   933
  if (_scratch_classes == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   934
    return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   935
  }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   936
  // Zero initialize the _scratch_classes array.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   937
  for (int i = 0; i < _class_count; i++) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   938
    _scratch_classes[i] = NULL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   939
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   940
489c9b5090e2 Initial load
duke
parents:
diff changeset
   941
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   942
489c9b5090e2 Initial load
duke
parents:
diff changeset
   943
  JvmtiThreadState *state = JvmtiThreadState::state_for(JavaThread::current());
2135
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
   944
  // state can only be NULL if the current thread is exiting which
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
   945
  // should not happen since we're trying to do a RedefineClasses
f82c3012ec86 6800721: 3/4 JavaThread::jvmti_thread_state() and JvmtiThreadState::state_for() robustness
dcubed
parents: 1
diff changeset
   946
  guarantee(state != NULL, "exiting thread calling load_new_class_versions");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   947
  for (int i = 0; i < _class_count; i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   948
    // Create HandleMark so that any handles created while loading new class
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   949
    // versions are deleted. Constant pools are deallocated while merging
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   950
    // constant pools
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   951
    HandleMark hm(THREAD);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   952
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   953
    oop mirror = JNIHandles::resolve_non_null(_class_defs[i].klass);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   954
    // classes for primitives cannot be redefined
489c9b5090e2 Initial load
duke
parents:
diff changeset
   955
    if (!is_modifiable_class(mirror)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   956
      return JVMTI_ERROR_UNMODIFIABLE_CLASS;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   957
    }
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   958
    Klass* the_class_oop = java_lang_Class::as_Klass(mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   959
    instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop);
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
   960
    Symbol*  the_class_sym = the_class->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   961
489c9b5090e2 Initial load
duke
parents:
diff changeset
   962
    // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
   963
    RC_TRACE_WITH_THREAD(0x00000001, THREAD,
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
   964
      ("loading name=%s kind=%d (avail_mem=" UINT64_FORMAT "K)",
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
   965
      the_class->external_name(), _class_load_kind,
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
   966
      os::available_memory() >> 10));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   967
489c9b5090e2 Initial load
duke
parents:
diff changeset
   968
    ClassFileStream st((u1*) _class_defs[i].class_bytes,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   969
      _class_defs[i].class_byte_count, (char *)"__VM_RedefineClasses__");
489c9b5090e2 Initial load
duke
parents:
diff changeset
   970
489c9b5090e2 Initial load
duke
parents:
diff changeset
   971
    // Parse the stream.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   972
    Handle the_class_loader(THREAD, the_class->class_loader());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   973
    Handle protection_domain(THREAD, the_class->protection_domain());
489c9b5090e2 Initial load
duke
parents:
diff changeset
   974
    // Set redefined class handle in JvmtiThreadState class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   975
    // This redefined class is sent to agent event handler for class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
   976
    // load hook event.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   977
    state->set_class_being_redefined(&the_class, _class_load_kind);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   978
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   979
    Klass* k = SystemDictionary::parse_stream(the_class_sym,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   980
                                                the_class_loader,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   981
                                                protection_domain,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   982
                                                &st,
489c9b5090e2 Initial load
duke
parents:
diff changeset
   983
                                                THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   984
    // Clear class_being_redefined just to be sure.
489c9b5090e2 Initial load
duke
parents:
diff changeset
   985
    state->clear_class_being_redefined();
489c9b5090e2 Initial load
duke
parents:
diff changeset
   986
489c9b5090e2 Initial load
duke
parents:
diff changeset
   987
    // TODO: if this is retransform, and nothing changed we can skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
   988
489c9b5090e2 Initial load
duke
parents:
diff changeset
   989
    instanceKlassHandle scratch_class (THREAD, k);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   990
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   991
    // Need to clean up allocated InstanceKlass if there's an error so assign
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   992
    // the result here. Caller deallocates all the scratch classes in case of
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   993
    // an error.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   994
    _scratch_classes[i] = k;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   995
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   996
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
   997
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
   998
      // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
   999
      RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("parse_stream exception: '%s'",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1000
        ex_name->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1001
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1002
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1003
      if (ex_name == vmSymbols::java_lang_UnsupportedClassVersionError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1004
        return JVMTI_ERROR_UNSUPPORTED_VERSION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1005
      } else if (ex_name == vmSymbols::java_lang_ClassFormatError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1006
        return JVMTI_ERROR_INVALID_CLASS_FORMAT;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1007
      } else if (ex_name == vmSymbols::java_lang_ClassCircularityError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1008
        return JVMTI_ERROR_CIRCULAR_CLASS_DEFINITION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1009
      } else if (ex_name == vmSymbols::java_lang_NoClassDefFoundError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1010
        // The message will be "XXX (wrong name: YYY)"
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1011
        return JVMTI_ERROR_NAMES_DONT_MATCH;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1012
      } else if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1013
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1014
      } else {  // Just in case more exceptions can be thrown..
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1015
        return JVMTI_ERROR_FAILS_VERIFICATION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1016
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1017
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1018
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1019
    // Ensure class is linked before redefine
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1020
    if (!the_class->is_linked()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1021
      the_class->link_class(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1022
      if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1023
        Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1024
        // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1025
        RC_TRACE_WITH_THREAD(0x00000002, THREAD, ("link_class exception: '%s'",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1026
          ex_name->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1027
        CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1028
        if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1029
          return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1030
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1031
          return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1032
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1033
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1034
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1035
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1036
    // Do the validity checks in compare_and_normalize_class_versions()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1037
    // before verifying the byte codes. By doing these checks first, we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1038
    // limit the number of functions that require redirection from
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1039
    // the_class to scratch_class. In particular, we don't have to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1040
    // modify JNI GetSuperclass() and thus won't change its performance.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1041
    jvmtiError res = compare_and_normalize_class_versions(the_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1042
                       scratch_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1043
    if (res != JVMTI_ERROR_NONE) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1044
      return res;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1045
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1046
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1047
    // verify what the caller passed us
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1048
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1049
      // The bug 6214132 caused the verification to fail.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1050
      // Information about the_class and scratch_class is temporarily
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1051
      // recorded into jvmtiThreadState. This data is used to redirect
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1052
      // the_class to scratch_class in the JVM_* functions called by the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1053
      // verifier. Please, refer to jvmtiThreadState.hpp for the detailed
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1054
      // description.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1055
      RedefineVerifyMark rvm(&the_class, &scratch_class, state);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1056
      Verifier::verify(
3820
0a8fbbe180db 6830542: Performance: JVM_DefineClass already verified.
acorn
parents: 2154
diff changeset
  1057
        scratch_class, Verifier::ThrowException, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1058
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1059
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1060
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1061
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1062
      // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1063
      RC_TRACE_WITH_THREAD(0x00000002, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1064
        ("verify_byte_codes exception: '%s'", ex_name->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1065
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1066
      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1067
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1068
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1069
        // tell the caller the bytecodes are bad
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1070
        return JVMTI_ERROR_FAILS_VERIFICATION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1071
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1072
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1073
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1074
    res = merge_cp_and_rewrite(the_class, scratch_class, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1075
    if (res != JVMTI_ERROR_NONE) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1076
      return res;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1077
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1078
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1079
    if (VerifyMergedCPBytecodes) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1080
      // verify what we have done during constant pool merging
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1081
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1082
        RedefineVerifyMark rvm(&the_class, &scratch_class, state);
3820
0a8fbbe180db 6830542: Performance: JVM_DefineClass already verified.
acorn
parents: 2154
diff changeset
  1083
        Verifier::verify(scratch_class, Verifier::ThrowException, true, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1084
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1085
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1086
      if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1087
        Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1088
        // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1089
        RC_TRACE_WITH_THREAD(0x00000002, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1090
          ("verify_byte_codes post merge-CP exception: '%s'",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1091
          ex_name->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1092
        CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1093
        if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1094
          return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1095
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1096
          // tell the caller that constant pool merging screwed up
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1097
          return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1098
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1099
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1100
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1101
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1102
    Rewriter::rewrite(scratch_class, THREAD);
9971
d496ecd7b9de 7033141: assert(has_cp_cache(i)) failed: oob
coleenp
parents: 8726
diff changeset
  1103
    if (!HAS_PENDING_EXCEPTION) {
15099
b31d40895bbb 8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents: 15097
diff changeset
  1104
      scratch_class->link_methods(THREAD);
9971
d496ecd7b9de 7033141: assert(has_cp_cache(i)) failed: oob
coleenp
parents: 8726
diff changeset
  1105
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1106
    if (HAS_PENDING_EXCEPTION) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1107
      Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1108
      CLEAR_PENDING_EXCEPTION;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1109
      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1110
        return JVMTI_ERROR_OUT_OF_MEMORY;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1111
      } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1112
        return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1113
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1114
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1115
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1116
    // RC_TRACE_WITH_THREAD macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1117
    RC_TRACE_WITH_THREAD(0x00000001, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1118
      ("loaded name=%s (avail_mem=" UINT64_FORMAT "K)",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1119
      the_class->external_name(), os::available_memory() >> 10));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1120
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1121
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1122
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1123
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1124
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1125
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1126
// Map old_index to new_index as needed. scratch_cp is only needed
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1127
// for RC_TRACE() calls.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1128
void VM_RedefineClasses::map_index(constantPoolHandle scratch_cp,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1129
       int old_index, int new_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1130
  if (find_new_index(old_index) != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1131
    // old_index is already mapped
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1132
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1133
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1134
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1135
  if (old_index == new_index) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1136
    // no mapping is needed
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1137
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1138
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1139
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1140
  _index_map_p->at_put(old_index, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1141
  _index_map_count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1142
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1143
  RC_TRACE(0x00040000, ("mapped tag %d at index %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1144
    scratch_cp->tag_at(old_index).value(), old_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1145
} // end map_index()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1146
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1147
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1148
// Map old_index to new_index as needed.
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1149
void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1150
  if (find_new_operand_index(old_index) != -1) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1151
    // old_index is already mapped
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1152
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1153
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1154
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1155
  if (old_index == new_index) {
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1156
    // no mapping is needed
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1157
    return;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1158
  }
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1159
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1160
  _operands_index_map_p->at_put(old_index, new_index);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1161
  _operands_index_map_count++;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1162
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1163
  RC_TRACE(0x00040000, ("mapped bootstrap specifier at index %d to %d", old_index, new_index));
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1164
} // end map_index()
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1165
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1166
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1167
// Merge old_cp and scratch_cp and return the results of the merge via
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1168
// merge_cp_p. The number of entries in *merge_cp_p is returned via
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1169
// merge_cp_length_p. The entries in old_cp occupy the same locations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1170
// in *merge_cp_p. Also creates a map of indices from entries in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1171
// scratch_cp to the corresponding entry in *merge_cp_p. Index map
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1172
// entries are only created for entries in scratch_cp that occupy a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1173
// different location in *merged_cp_p.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1174
bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1175
       constantPoolHandle scratch_cp, constantPoolHandle *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1176
       int *merge_cp_length_p, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1177
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1178
  if (merge_cp_p == NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1179
    assert(false, "caller must provide scratch constantPool");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1180
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1181
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1182
  if (merge_cp_length_p == NULL) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1183
    assert(false, "caller must provide scratch CP length");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1184
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1185
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1186
  // Worst case we need old_cp->length() + scratch_cp()->length(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1187
  // but the caller might be smart so make sure we have at least
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1188
  // the minimum.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1189
  if ((*merge_cp_p)->length() < old_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1190
    assert(false, "merge area too small");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1191
    return false; // robustness
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1192
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1193
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1194
  RC_TRACE_WITH_THREAD(0x00010000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1195
    ("old_cp_len=%d, scratch_cp_len=%d", old_cp->length(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1196
    scratch_cp->length()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1197
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1198
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1199
    // Pass 0:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1200
    // The old_cp is copied to *merge_cp_p; this means that any code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1201
    // using old_cp does not have to change. This work looks like a
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1202
    // perfect fit for ConstantPool*::copy_cp_to(), but we need to
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1203
    // handle one special case:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1204
    // - revert JVM_CONSTANT_Class to JVM_CONSTANT_UnresolvedClass
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1205
    // This will make verification happy.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1206
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1207
    int old_i;  // index into old_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1208
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1209
    // index zero (0) is not used in constantPools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1210
    for (old_i = 1; old_i < old_cp->length(); old_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1211
      // leave debugging crumb
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1212
      jbyte old_tag = old_cp->tag_at(old_i).value();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1213
      switch (old_tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1214
      case JVM_CONSTANT_Class:
8651
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1215
      case JVM_CONSTANT_UnresolvedClass:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1216
        // revert the copy to JVM_CONSTANT_UnresolvedClass
8651
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1217
        // May be resolving while calling this so do the same for
81b517a9249f 6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool")
coleenp
parents: 8296
diff changeset
  1218
        // JVM_CONSTANT_UnresolvedClass (klass_name_at() deals with transition)
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1219
        (*merge_cp_p)->unresolved_klass_at_put(old_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1220
          old_cp->klass_name_at(old_i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1221
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1222
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1223
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1224
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1225
        // just copy the entry to *merge_cp_p, but double and long take
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1226
        // two constant pool entries
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1227
        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1228
        old_i++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1229
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1230
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1231
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1232
        // just copy the entry to *merge_cp_p
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1233
        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i, CHECK_0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1234
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1235
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1236
    } // end for each old_cp entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1237
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1238
    ConstantPool::copy_operands(old_cp, *merge_cp_p, CHECK_0);
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1239
    (*merge_cp_p)->extend_operands(scratch_cp, CHECK_0);
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1240
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1241
    // We don't need to sanity check that *merge_cp_length_p is within
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1242
    // *merge_cp_p bounds since we have the minimum on-entry check above.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1243
    (*merge_cp_length_p) = old_i;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1244
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1245
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1246
  // merge_cp_len should be the same as old_cp->length() at this point
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1247
  // so this trace message is really a "warm-and-breathing" message.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1248
  RC_TRACE_WITH_THREAD(0x00020000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1249
    ("after pass 0: merge_cp_len=%d", *merge_cp_length_p));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1250
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1251
  int scratch_i;  // index into scratch_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1252
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1253
    // Pass 1a:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1254
    // Compare scratch_cp entries to the old_cp entries that we have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1255
    // already copied to *merge_cp_p. In this pass, we are eliminating
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1256
    // exact duplicates (matching entry at same index) so we only
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1257
    // compare entries in the common indice range.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1258
    int increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1259
    int pass1a_length = MIN2(old_cp->length(), scratch_cp->length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1260
    for (scratch_i = 1; scratch_i < pass1a_length; scratch_i += increment) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1261
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1262
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1263
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1264
        // double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1265
        increment = 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1266
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1267
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1268
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1269
        increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1270
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1271
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1272
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1273
      bool match = scratch_cp->compare_entry_to(scratch_i, *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1274
        scratch_i, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1275
      if (match) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1276
        // found a match at the same index so nothing more to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1277
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1278
      } else if (is_unresolved_class_mismatch(scratch_cp, scratch_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1279
                                              *merge_cp_p, scratch_i)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1280
        // The mismatch in compare_entry_to() above is because of a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1281
        // resolved versus unresolved class entry at the same index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1282
        // with the same string value. Since Pass 0 reverted any
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1283
        // class entries to unresolved class entries in *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1284
        // we go with the unresolved class entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1285
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1286
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1287
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1288
      int found_i = scratch_cp->find_matching_entry(scratch_i, *merge_cp_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1289
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1290
      if (found_i != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1291
        guarantee(found_i != scratch_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1292
          "compare_entry_to() and find_matching_entry() do not agree");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1293
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1294
        // Found a matching entry somewhere else in *merge_cp_p so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1295
        // just need a mapping entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1296
        map_index(scratch_cp, scratch_i, found_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1297
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1298
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1299
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1300
      // The find_matching_entry() call above could fail to find a match
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1301
      // due to a resolved versus unresolved class or string entry situation
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1302
      // like we solved above with the is_unresolved_*_mismatch() calls.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1303
      // However, we would have to call is_unresolved_*_mismatch() over
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1304
      // all of *merge_cp_p (potentially) and that doesn't seem to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1305
      // worth the time.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1306
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1307
      // No match found so we have to append this entry and any unique
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1308
      // referenced entries to *merge_cp_p.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1309
      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1310
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1311
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1312
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1313
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1314
  RC_TRACE_WITH_THREAD(0x00020000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1315
    ("after pass 1a: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1316
    *merge_cp_length_p, scratch_i, _index_map_count));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1317
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1318
  if (scratch_i < scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1319
    // Pass 1b:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1320
    // old_cp is smaller than scratch_cp so there are entries in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1321
    // scratch_cp that we have not yet processed. We take care of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1322
    // those now.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1323
    int increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1324
    for (; scratch_i < scratch_cp->length(); scratch_i += increment) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1325
      switch (scratch_cp->tag_at(scratch_i).value()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1326
      case JVM_CONSTANT_Double:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1327
      case JVM_CONSTANT_Long:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1328
        // double and long take two constant pool entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1329
        increment = 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1330
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1331
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1332
      default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1333
        increment = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1334
        break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1335
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1336
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1337
      int found_i =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1338
        scratch_cp->find_matching_entry(scratch_i, *merge_cp_p, CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1339
      if (found_i != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1340
        // Found a matching entry somewhere else in *merge_cp_p so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1341
        // just need a mapping entry.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1342
        map_index(scratch_cp, scratch_i, found_i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1343
        continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1344
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1345
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1346
      // No match found so we have to append this entry and any unique
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1347
      // referenced entries to *merge_cp_p.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1348
      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1349
        CHECK_0);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1350
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1351
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1352
    RC_TRACE_WITH_THREAD(0x00020000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1353
      ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1354
      *merge_cp_length_p, scratch_i, _index_map_count));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1355
  }
17864
29aa71317b51 8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
sspitsyn
parents: 17373
diff changeset
  1356
  finalize_operands_merge(*merge_cp_p, THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1357
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1358
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1359
} // end merge_constant_pools()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1360
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1361
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1362
// Scoped object to clean up the constant pool(s) created for merging
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1363
class MergeCPCleaner {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1364
  ClassLoaderData*   _loader_data;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1365
  ConstantPool*      _cp;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1366
  ConstantPool*      _scratch_cp;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1367
 public:
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1368
  MergeCPCleaner(ClassLoaderData* loader_data, ConstantPool* merge_cp) :
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1369
                 _loader_data(loader_data), _cp(merge_cp), _scratch_cp(NULL) {}
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1370
  ~MergeCPCleaner() {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1371
    _loader_data->add_to_deallocate_list(_cp);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1372
    if (_scratch_cp != NULL) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1373
      _loader_data->add_to_deallocate_list(_scratch_cp);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1374
    }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1375
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1376
  void add_scratch_cp(ConstantPool* scratch_cp) { _scratch_cp = scratch_cp; }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1377
};
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1378
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1379
// Merge constant pools between the_class and scratch_class and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1380
// potentially rewrite bytecodes in scratch_class to use the merged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1381
// constant pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1382
jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1383
             instanceKlassHandle the_class, instanceKlassHandle scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1384
             TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1385
  // worst case merged constant pool length is old and new combined
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1386
  int merge_cp_length = the_class->constants()->length()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1387
        + scratch_class->constants()->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1388
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1389
  // Constant pools are not easily reused so we allocate a new one
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1390
  // each time.
1894
5c343868d071 6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents: 1
diff changeset
  1391
  // merge_cp is created unsafe for concurrent GC processing.  It
8296
b1c2163e4e59 6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents: 8076
diff changeset
  1392
  // should be marked safe before discarding it. Even though
b1c2163e4e59 6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents: 8076
diff changeset
  1393
  // garbage,  if it crosses a card boundary, it may be scanned
1894
5c343868d071 6692899: CMS: many vm.parallel_class_loading tests fail with assert "missing Printezis mark"
jmasa
parents: 1
diff changeset
  1394
  // in order to find the start of the first complete object on the card.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1395
  ClassLoaderData* loader_data = the_class->class_loader_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1396
  ConstantPool* merge_cp_oop =
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1397
    ConstantPool::allocate(loader_data,
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1398
                                  merge_cp_length,
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1399
                                  THREAD);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1400
  MergeCPCleaner cp_cleaner(loader_data, merge_cp_oop);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1401
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1402
  HandleMark hm(THREAD);  // make sure handles are cleared before
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1403
                          // MergeCPCleaner clears out merge_cp_oop
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1404
  constantPoolHandle merge_cp(THREAD, merge_cp_oop);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1405
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1406
  // Get constants() from the old class because it could have been rewritten
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1407
  // while we were at a safepoint allocating a new constant pool.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1408
  constantPoolHandle old_cp(THREAD, the_class->constants());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1409
  constantPoolHandle scratch_cp(THREAD, scratch_class->constants());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1410
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1411
  // If the length changed, the class was redefined out from under us. Return
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1412
  // an error.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1413
  if (merge_cp_length != the_class->constants()->length()
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1414
         + scratch_class->constants()->length()) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1415
    return JVMTI_ERROR_INTERNAL;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1416
  }
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1417
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  1418
  // Update the version number of the constant pool
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  1419
  merge_cp->increment_and_save_version(old_cp->version());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1420
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1421
  ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1422
  _index_map_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1423
  _index_map_p = new intArray(scratch_cp->length(), -1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1424
17077
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1425
  _operands_cur_length = ConstantPool::operand_array_length(old_cp->operands());
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1426
  _operands_index_map_count = 0;
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1427
  _operands_index_map_p = new intArray(
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1428
    ConstantPool::operand_array_length(scratch_cp->operands()), -1);
8607f7c33310 8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
sspitsyn
parents: 17029
diff changeset
  1429
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1430
  // reference to the cp holder is needed for copy_operands()
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1431
  merge_cp->set_pool_holder(scratch_class());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1432
  bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1433
                  &merge_cp_length, THREAD);
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1434
  merge_cp->set_pool_holder(NULL);
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  1435
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1436
  if (!result) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1437
    // The merge can fail due to memory allocation failure or due
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1438
    // to robustness checks.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1439
    return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1440
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1441
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1442
  RC_TRACE_WITH_THREAD(0x00010000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1443
    ("merge_cp_len=%d, index_map_len=%d", merge_cp_length, _index_map_count));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1444
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1445
  if (_index_map_count == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1446
    // there is nothing to map between the new and merged constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1447
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1448
    if (old_cp->length() == scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1449
      // The old and new constant pools are the same length and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1450
      // index map is empty. This means that the three constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1451
      // are equivalent (but not the same). Unfortunately, the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1452
      // constant pool has not gone through link resolution nor have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1453
      // the new class bytecodes gone through constant pool cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1454
      // rewriting so we can't use the old constant pool with the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1455
      // class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1456
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1457
      // toss the merged constant pool at return
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1458
    } else if (old_cp->length() < scratch_cp->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1459
      // The old constant pool has fewer entries than the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1460
      // pool and the index map is empty. This means the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1461
      // pool is a superset of the old constant pool. However, the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1462
      // class bytecodes have already gone through constant pool cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1463
      // rewriting so we can't use the new constant pool with the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1464
      // class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1465
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1466
      // toss the merged constant pool at return
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1467
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1468
      // The old constant pool has more entries than the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1469
      // pool and the index map is empty. This means that both the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1470
      // and merged constant pools are supersets of the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1471
      // pool.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1472
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1473
      // Replace the new constant pool with a shrunken copy of the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1474
      // merged constant pool
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1475
      set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1476
      // The new constant pool replaces scratch_cp so have cleaner clean it up.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1477
      // It can't be cleaned up while there are handles to it.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1478
      cp_cleaner.add_scratch_cp(scratch_cp());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1479
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1480
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1481
    if (RC_TRACE_ENABLED(0x00040000)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1482
      // don't want to loop unless we are tracing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1483
      int count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1484
      for (int i = 1; i < _index_map_p->length(); i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1485
        int value = _index_map_p->at(i);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1486
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1487
        if (value != -1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1488
          RC_TRACE_WITH_THREAD(0x00040000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1489
            ("index_map[%d]: old=%d new=%d", count, i, value));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1490
          count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1491
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1492
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1493
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1494
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1495
    // We have entries mapped between the new and merged constant pools
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1496
    // so we have to rewrite some constant pool references.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1497
    if (!rewrite_cp_refs(scratch_class, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1498
      return JVMTI_ERROR_INTERNAL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1499
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1500
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1501
    // Replace the new constant pool with a shrunken copy of the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1502
    // merged constant pool so now the rewritten bytecodes have
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1503
    // valid references; the previous new constant pool will get
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1504
    // GCed.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1505
    set_new_constant_pool(loader_data, scratch_class, merge_cp, merge_cp_length, THREAD);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1506
    // The new constant pool replaces scratch_cp so have cleaner clean it up.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1507
    // It can't be cleaned up while there are handles to it.
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1508
    cp_cleaner.add_scratch_cp(scratch_cp());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1509
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1510
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1511
  return JVMTI_ERROR_NONE;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1512
} // end merge_cp_and_rewrite()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1513
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1514
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1515
// Rewrite constant pool references in klass scratch_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1516
bool VM_RedefineClasses::rewrite_cp_refs(instanceKlassHandle scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1517
       TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1518
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1519
  // rewrite constant pool references in the methods:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1520
  if (!rewrite_cp_refs_in_methods(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1521
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1522
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1523
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1524
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1525
  // rewrite constant pool references in the class_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1526
  if (!rewrite_cp_refs_in_class_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1527
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1528
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1529
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1530
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1531
  // rewrite constant pool references in the fields_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1532
  if (!rewrite_cp_refs_in_fields_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1533
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1534
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1535
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1536
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1537
  // rewrite constant pool references in the methods_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1538
  if (!rewrite_cp_refs_in_methods_annotations(scratch_class, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1539
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1540
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1541
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1542
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1543
  // rewrite constant pool references in the methods_parameter_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1544
  if (!rewrite_cp_refs_in_methods_parameter_annotations(scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1545
         THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1546
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1547
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1548
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1549
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1550
  // rewrite constant pool references in the methods_default_annotations:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1551
  if (!rewrite_cp_refs_in_methods_default_annotations(scratch_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1552
         THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1553
    // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1554
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1555
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1556
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1557
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1558
} // end rewrite_cp_refs()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1559
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1560
// Rewrite constant pool references in the methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1561
bool VM_RedefineClasses::rewrite_cp_refs_in_methods(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1562
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1563
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1564
  Array<Method*>* methods = scratch_class->methods();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1565
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1566
  if (methods == NULL || methods->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1567
    // no methods so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1568
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1569
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1570
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1571
  // rewrite constant pool references in the methods:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1572
  for (int i = methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1573
    methodHandle method(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1574
    methodHandle new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1575
    rewrite_cp_refs_in_method(method, &new_method, CHECK_false);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1576
    if (!new_method.is_null()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1577
      // the method has been replaced so save the new method version
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1578
      methods->at_put(i, new_method());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1579
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1580
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1581
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1582
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1583
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1584
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1585
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1586
// Rewrite constant pool references in the specific method. This code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1587
// was adapted from Rewriter::rewrite_method().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1588
void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1589
       methodHandle *new_method_p, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1590
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1591
  *new_method_p = methodHandle();  // default is no new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1592
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1593
  // We cache a pointer to the bytecodes here in code_base. If GC
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1594
  // moves the Method*, then the bytecodes will also move which
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1595
  // will likely cause a crash. We create a No_Safepoint_Verifier
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1596
  // object to detect whether we pass a possible safepoint in this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1597
  // code block.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1598
  No_Safepoint_Verifier nsv;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1599
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1600
  // Bytecodes and their length
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1601
  address code_base = method->code_base();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1602
  int code_length = method->code_size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1603
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1604
  int bc_length;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1605
  for (int bci = 0; bci < code_length; bci += bc_length) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1606
    address bcp = code_base + bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1607
    Bytecodes::Code c = (Bytecodes::Code)(*bcp);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1608
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1609
    bc_length = Bytecodes::length_for(c);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1610
    if (bc_length == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1611
      // More complicated bytecodes report a length of zero so
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1612
      // we have to try again a slightly different way.
7913
dd096a83bdbb 4926272: methodOopDesc::method_from_bcp is unsafe
never
parents: 7436
diff changeset
  1613
      bc_length = Bytecodes::length_at(method(), bcp);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1614
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1615
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1616
    assert(bc_length != 0, "impossible bytecode length");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1617
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1618
    switch (c) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1619
      case Bytecodes::_ldc:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1620
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1621
        int cp_index = *(bcp + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1622
        int new_index = find_new_index(cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1623
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1624
        if (StressLdcRewrite && new_index == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1625
          // If we are stressing ldc -> ldc_w rewriting, then we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1626
          // always need a new_index value.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1627
          new_index = cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1628
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1629
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1630
          // the original index is mapped so we have more work to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1631
          if (!StressLdcRewrite && new_index <= max_jubyte) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1632
            // The new value can still use ldc instead of ldc_w
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1633
            // unless we are trying to stress ldc -> ldc_w rewriting
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1634
            RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1635
              ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1636
              bcp, cp_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1637
            *(bcp + 1) = new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1638
          } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1639
            RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1640
              ("%s->ldc_w@" INTPTR_FORMAT " old=%d, new=%d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1641
              Bytecodes::name(c), bcp, cp_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1642
            // the new value needs ldc_w instead of ldc
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1643
            u_char inst_buffer[4]; // max instruction size is 4 bytes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1644
            bcp = (address)inst_buffer;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1645
            // construct new instruction sequence
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1646
            *bcp = Bytecodes::_ldc_w;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1647
            bcp++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1648
            // Rewriter::rewrite_method() does not rewrite ldc -> ldc_w.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1649
            // See comment below for difference between put_Java_u2()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1650
            // and put_native_u2().
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1651
            Bytes::put_Java_u2(bcp, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1652
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1653
            Relocator rc(method, NULL /* no RelocatorListener needed */);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1654
            methodHandle m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1655
            {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1656
              Pause_No_Safepoint_Verifier pnsv(&nsv);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1657
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1658
              // ldc is 2 bytes and ldc_w is 3 bytes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1659
              m = rc.insert_space_at(bci, 3, inst_buffer, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1660
              if (m.is_null() || HAS_PENDING_EXCEPTION) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1661
                guarantee(false, "insert_space_at() failed");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1662
              }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1663
            }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1664
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1665
            // return the new method so that the caller can update
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1666
            // the containing class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1667
            *new_method_p = method = m;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1668
            // switch our bytecode processing loop from the old method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1669
            // to the new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1670
            code_base = method->code_base();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1671
            code_length = method->code_size();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1672
            bcp = code_base + bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1673
            c = (Bytecodes::Code)(*bcp);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1674
            bc_length = Bytecodes::length_for(c);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1675
            assert(bc_length != 0, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1676
          } // end we need ldc_w instead of ldc
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1677
        } // end if there is a mapped index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1678
      } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1679
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1680
      // these bytecodes have a two-byte constant pool index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1681
      case Bytecodes::_anewarray      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1682
      case Bytecodes::_checkcast      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1683
      case Bytecodes::_getfield       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1684
      case Bytecodes::_getstatic      : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1685
      case Bytecodes::_instanceof     : // fall through
15446
5ea56212959f 8006731: JSR 292: the VM_RedefineClasses::rewrite_cp_refs_in_method() must support invokedynamic
sspitsyn
parents: 15444
diff changeset
  1686
      case Bytecodes::_invokedynamic  : // fall through
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1687
      case Bytecodes::_invokeinterface: // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1688
      case Bytecodes::_invokespecial  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1689
      case Bytecodes::_invokestatic   : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1690
      case Bytecodes::_invokevirtual  : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1691
      case Bytecodes::_ldc_w          : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1692
      case Bytecodes::_ldc2_w         : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1693
      case Bytecodes::_multianewarray : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1694
      case Bytecodes::_new            : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1695
      case Bytecodes::_putfield       : // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1696
      case Bytecodes::_putstatic      :
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1697
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1698
        address p = bcp + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1699
        int cp_index = Bytes::get_Java_u2(p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1700
        int new_index = find_new_index(cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1701
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1702
          // the original index is mapped so update w/ new value
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1703
          RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1704
            ("%s@" INTPTR_FORMAT " old=%d, new=%d", Bytecodes::name(c),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1705
            bcp, cp_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1706
          // Rewriter::rewrite_method() uses put_native_u2() in this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1707
          // situation because it is reusing the constant pool index
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  1708
          // location for a native index into the ConstantPoolCache.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1709
          // Since we are updating the constant pool index prior to
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  1710
          // verification and ConstantPoolCache initialization, we
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1711
          // need to keep the new index in Java byte order.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1712
          Bytes::put_Java_u2(p, new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1713
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1714
      } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1715
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1716
  } // end for each bytecode
15744
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1717
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1718
  // We also need to rewrite the parameter name indexes, if there is
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1719
  // method parameter data present
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1720
  if(method->has_method_parameters()) {
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1721
    const int len = method->method_parameters_length();
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1722
    MethodParametersElement* elem = method->method_parameters_start();
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1723
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1724
    for (int i = 0; i < len; i++) {
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1725
      const u2 cp_index = elem[i].name_cp_index;
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1726
      elem[i].name_cp_index = find_new_index(cp_index);
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1727
    }
fd58c7e770b3 8007153: Ensure that MethodParameters API works properly with RedefineClasses
emc
parents: 15601
diff changeset
  1728
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1729
} // end rewrite_cp_refs_in_method()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1730
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1731
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1732
// Rewrite constant pool references in the class_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1733
bool VM_RedefineClasses::rewrite_cp_refs_in_class_annotations(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1734
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1735
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1736
  AnnotationArray* class_annotations = scratch_class->class_annotations();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1737
  if (class_annotations == NULL || class_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1738
    // no class_annotations so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1739
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1740
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1741
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1742
  RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1743
    ("class_annotations length=%d", class_annotations->length()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1744
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1745
  int byte_i = 0;  // byte index into class_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1746
  return rewrite_cp_refs_in_annotations_typeArray(class_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1747
           THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1748
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1749
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1750
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1751
// Rewrite constant pool references in an annotations typeArray. This
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1752
// "structure" is adapted from the RuntimeVisibleAnnotations_attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1753
// that is described in section 4.8.15 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1754
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1755
// annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1756
//   u2 num_annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1757
//   annotation annotations[num_annotations];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1758
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1759
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1760
bool VM_RedefineClasses::rewrite_cp_refs_in_annotations_typeArray(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1761
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1762
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1763
  if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1764
    // not enough room for num_annotations field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1765
    RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1766
      ("length() is too small for num_annotations field"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1767
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1768
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1769
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1770
  u2 num_annotations = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1771
                         annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1772
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1773
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1774
  RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1775
    ("num_annotations=%d", num_annotations));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1776
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1777
  int calc_num_annotations = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1778
  for (; calc_num_annotations < num_annotations; calc_num_annotations++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1779
    if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1780
           byte_i_ref, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1781
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1782
        ("bad annotation_struct at %d", calc_num_annotations));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1783
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1784
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1785
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1786
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1787
  assert(num_annotations == calc_num_annotations, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1788
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1789
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1790
} // end rewrite_cp_refs_in_annotations_typeArray()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1791
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1792
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1793
// Rewrite constant pool references in the annotation struct portion of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1794
// an annotations_typeArray. This "structure" is from section 4.8.15 of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1795
// the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1796
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1797
// struct annotation {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1798
//   u2 type_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1799
//   u2 num_element_value_pairs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1800
//   {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1801
//     u2 element_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1802
//     element_value value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1803
//   } element_value_pairs[num_element_value_pairs];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1804
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1805
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1806
bool VM_RedefineClasses::rewrite_cp_refs_in_annotation_struct(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1807
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1808
  if ((byte_i_ref + 2 + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1809
    // not enough room for smallest annotation_struct
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1810
    RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1811
      ("length() is too small for annotation_struct"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1812
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1813
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1814
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1815
  u2 type_index = rewrite_cp_ref_in_annotation_data(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1816
                    byte_i_ref, "mapped old type_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1817
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1818
  u2 num_element_value_pairs = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1819
                                 annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1820
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1821
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1822
  RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1823
    ("type_index=%d  num_element_value_pairs=%d", type_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1824
    num_element_value_pairs));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1825
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1826
  int calc_num_element_value_pairs = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1827
  for (; calc_num_element_value_pairs < num_element_value_pairs;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1828
       calc_num_element_value_pairs++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1829
    if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1830
      // not enough room for another element_name_index, let alone
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1831
      // the rest of another component
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1832
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1833
        ("length() is too small for element_name_index"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1834
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1835
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1836
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1837
    u2 element_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1838
                              annotations_typeArray, byte_i_ref,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1839
                              "mapped old element_name_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1840
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1841
    RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1842
      ("element_name_index=%d", element_name_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1843
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1844
    if (!rewrite_cp_refs_in_element_value(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1845
           byte_i_ref, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1846
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1847
        ("bad element_value at %d", calc_num_element_value_pairs));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1848
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1849
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1850
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1851
  } // end for each component
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1852
  assert(num_element_value_pairs == calc_num_element_value_pairs,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1853
    "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1854
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1855
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1856
} // end rewrite_cp_refs_in_annotation_struct()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1857
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1858
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1859
// Rewrite a constant pool reference at the current position in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1860
// annotations_typeArray if needed. Returns the original constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1861
// pool reference if a rewrite was not needed or the new constant
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1862
// pool reference if a rewrite was needed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1863
u2 VM_RedefineClasses::rewrite_cp_ref_in_annotation_data(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1864
     AnnotationArray* annotations_typeArray, int &byte_i_ref,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1865
     const char * trace_mesg, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1866
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1867
  address cp_index_addr = (address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1868
    annotations_typeArray->adr_at(byte_i_ref);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1869
  u2 old_cp_index = Bytes::get_Java_u2(cp_index_addr);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1870
  u2 new_cp_index = find_new_index(old_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1871
  if (new_cp_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1872
    RC_TRACE_WITH_THREAD(0x02000000, THREAD, (trace_mesg, old_cp_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1873
    Bytes::put_Java_u2(cp_index_addr, new_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1874
    old_cp_index = new_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1875
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1876
  byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1877
  return old_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1878
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1879
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1880
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1881
// Rewrite constant pool references in the element_value portion of an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1882
// annotations_typeArray. This "structure" is from section 4.8.15.1 of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1883
// the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1884
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1885
// struct element_value {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1886
//   u1 tag;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1887
//   union {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1888
//     u2 const_value_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1889
//     {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1890
//       u2 type_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1891
//       u2 const_name_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1892
//     } enum_const_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1893
//     u2 class_info_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1894
//     annotation annotation_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1895
//     struct {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1896
//       u2 num_values;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1897
//       element_value values[num_values];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1898
//     } array_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1899
//   } value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1900
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1901
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1902
bool VM_RedefineClasses::rewrite_cp_refs_in_element_value(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1903
       AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1904
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1905
  if ((byte_i_ref + 1) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1906
    // not enough room for a tag let alone the rest of an element_value
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1907
    RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1908
      ("length() is too small for a tag"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1909
    return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1910
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1911
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  1912
  u1 tag = annotations_typeArray->at(byte_i_ref);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1913
  byte_i_ref++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1914
  RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("tag='%c'", tag));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1915
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1916
  switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1917
    // These BaseType tag values are from Table 4.2 in VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1918
    case 'B':  // byte
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1919
    case 'C':  // char
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1920
    case 'D':  // double
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1921
    case 'F':  // float
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1922
    case 'I':  // int
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1923
    case 'J':  // long
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1924
    case 'S':  // short
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1925
    case 'Z':  // boolean
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1926
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1927
    // The remaining tag values are from Table 4.8 in the 2nd-edition of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1928
    // the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1929
    case 's':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1930
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1931
      // For the above tag values (including the BaseType values),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1932
      // value.const_value_index is right union field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1933
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1934
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1935
        // not enough room for a const_value_index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1936
        RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1937
          ("length() is too small for a const_value_index"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1938
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1939
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1940
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1941
      u2 const_value_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1942
                               annotations_typeArray, byte_i_ref,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1943
                               "mapped old const_value_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1944
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1945
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1946
        ("const_value_index=%d", const_value_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1947
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1948
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1949
    case 'e':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1950
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1951
      // for the above tag value, value.enum_const_value is right union field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1952
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1953
      if ((byte_i_ref + 4) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1954
        // not enough room for a enum_const_value
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1955
        RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1956
          ("length() is too small for a enum_const_value"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1957
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1958
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1959
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1960
      u2 type_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1961
                             annotations_typeArray, byte_i_ref,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1962
                             "mapped old type_name_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1963
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1964
      u2 const_name_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1965
                              annotations_typeArray, byte_i_ref,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1966
                              "mapped old const_name_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1967
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1968
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1969
        ("type_name_index=%d  const_name_index=%d", type_name_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1970
        const_name_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1971
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1972
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1973
    case 'c':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1974
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1975
      // for the above tag value, value.class_info_index is right union field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1976
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1977
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1978
        // not enough room for a class_info_index
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1979
        RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1980
          ("length() is too small for a class_info_index"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1981
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1982
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1983
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1984
      u2 class_info_index = rewrite_cp_ref_in_annotation_data(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1985
                              annotations_typeArray, byte_i_ref,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1986
                              "mapped old class_info_index=%d", THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1987
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1988
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1989
        ("class_info_index=%d", class_info_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1990
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1991
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1992
    case '@':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1993
      // For the above tag value, value.attr_value is the right union
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1994
      // field. This is a nested annotation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1995
      if (!rewrite_cp_refs_in_annotation_struct(annotations_typeArray,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1996
             byte_i_ref, THREAD)) {
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  1997
        // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1998
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  1999
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2000
      break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2001
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2002
    case '[':
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2003
    {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2004
      if ((byte_i_ref + 2) > annotations_typeArray->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2005
        // not enough room for a num_values field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2006
        RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2007
          ("length() is too small for a num_values field"));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2008
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2009
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2010
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2011
      // For the above tag value, value.array_value is the right union
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2012
      // field. This is an array of nested element_value.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2013
      u2 num_values = Bytes::get_Java_u2((address)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2014
                        annotations_typeArray->adr_at(byte_i_ref));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2015
      byte_i_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2016
      RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("num_values=%d", num_values));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2017
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2018
      int calc_num_values = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2019
      for (; calc_num_values < num_values; calc_num_values++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2020
        if (!rewrite_cp_refs_in_element_value(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2021
               annotations_typeArray, byte_i_ref, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2022
          RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2023
            ("bad nested element_value at %d", calc_num_values));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2024
          // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2025
          return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2026
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2027
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2028
      assert(num_values == calc_num_values, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2029
    } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2030
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2031
    default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2032
      RC_TRACE_WITH_THREAD(0x02000000, THREAD, ("bad tag=0x%x", tag));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2033
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2034
  } // end decode tag field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2035
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2036
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2037
} // end rewrite_cp_refs_in_element_value()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2038
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2039
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2040
// Rewrite constant pool references in a fields_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2041
bool VM_RedefineClasses::rewrite_cp_refs_in_fields_annotations(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2042
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2043
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2044
  Array<AnnotationArray*>* fields_annotations = scratch_class->fields_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2045
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2046
  if (fields_annotations == NULL || fields_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2047
    // no fields_annotations so nothing to do
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2048
    return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2049
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2050
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2051
  RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2052
    ("fields_annotations length=%d", fields_annotations->length()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2053
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2054
  for (int i = 0; i < fields_annotations->length(); i++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2055
    AnnotationArray* field_annotations = fields_annotations->at(i);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2056
    if (field_annotations == NULL || field_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2057
      // this field does not have any annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2058
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2059
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2060
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2061
    int byte_i = 0;  // byte index into field_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2062
    if (!rewrite_cp_refs_in_annotations_typeArray(field_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2063
           THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2064
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2065
        ("bad field_annotations at %d", i));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2066
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2067
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2068
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2069
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2070
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2071
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2072
} // end rewrite_cp_refs_in_fields_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2073
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2074
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2075
// Rewrite constant pool references in a methods_annotations field.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2076
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_annotations(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2077
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2078
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2079
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2080
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2081
    AnnotationArray* method_annotations = m->constMethod()->method_annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2082
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2083
    if (method_annotations == NULL || method_annotations->length() == 0) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2084
      // this method does not have any annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2085
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2086
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2087
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2088
    int byte_i = 0;  // byte index into method_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2089
    if (!rewrite_cp_refs_in_annotations_typeArray(method_annotations, byte_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2090
           THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2091
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2092
        ("bad method_annotations at %d", i));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2093
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2094
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2095
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2096
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2097
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2098
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2099
} // end rewrite_cp_refs_in_methods_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2100
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2101
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2102
// Rewrite constant pool references in a methods_parameter_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2103
// field. This "structure" is adapted from the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2104
// RuntimeVisibleParameterAnnotations_attribute described in section
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2105
// 4.8.17 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2106
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2107
// methods_parameter_annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2108
//   u1 num_parameters;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2109
//   {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2110
//     u2 num_annotations;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2111
//     annotation annotations[num_annotations];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2112
//   } parameter_annotations[num_parameters];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2113
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2114
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2115
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_parameter_annotations(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2116
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2117
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2118
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2119
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2120
    AnnotationArray* method_parameter_annotations = m->constMethod()->parameter_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2121
    if (method_parameter_annotations == NULL
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2122
        || method_parameter_annotations->length() == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2123
      // this method does not have any parameter annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2124
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2125
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2126
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2127
    if (method_parameter_annotations->length() < 1) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2128
      // not enough room for a num_parameters field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2129
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2130
        ("length() is too small for a num_parameters field at %d", i));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2131
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2132
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2133
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2134
    int byte_i = 0;  // byte index into method_parameter_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2135
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2136
    u1 num_parameters = method_parameter_annotations->at(byte_i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2137
    byte_i++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2138
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2139
    RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2140
      ("num_parameters=%d", num_parameters));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2141
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2142
    int calc_num_parameters = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2143
    for (; calc_num_parameters < num_parameters; calc_num_parameters++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2144
      if (!rewrite_cp_refs_in_annotations_typeArray(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2145
             method_parameter_annotations, byte_i, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2146
        RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2147
          ("bad method_parameter_annotations at %d", calc_num_parameters));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2148
        // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2149
        return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2150
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2151
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2152
    assert(num_parameters == calc_num_parameters, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2153
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2154
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2155
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2156
} // end rewrite_cp_refs_in_methods_parameter_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2157
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2158
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2159
// Rewrite constant pool references in a methods_default_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2160
// field. This "structure" is adapted from the AnnotationDefault_attribute
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2161
// that is described in section 4.8.19 of the 2nd-edition of the VM spec:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2162
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2163
// methods_default_annotations_typeArray {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2164
//   element_value default_value;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2165
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2166
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2167
bool VM_RedefineClasses::rewrite_cp_refs_in_methods_default_annotations(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2168
       instanceKlassHandle scratch_class, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2169
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2170
  for (int i = 0; i < scratch_class->methods()->length(); i++) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2171
    Method* m = scratch_class->methods()->at(i);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  2172
    AnnotationArray* method_default_annotations = m->constMethod()->default_annotations();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2173
    if (method_default_annotations == NULL
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2174
        || method_default_annotations->length() == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2175
      // this method does not have any default annotations so skip it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2176
      continue;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2177
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2178
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2179
    int byte_i = 0;  // byte index into method_default_annotations
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2180
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2181
    if (!rewrite_cp_refs_in_element_value(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2182
           method_default_annotations, byte_i, THREAD)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2183
      RC_TRACE_WITH_THREAD(0x02000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2184
        ("bad default element_value at %d", i));
2131
98f9cef66a34 6810672: Comment typos
twisti
parents: 1894
diff changeset
  2185
      // propagate failure back to caller
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2186
      return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2187
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2188
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2189
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2190
  return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2191
} // end rewrite_cp_refs_in_methods_default_annotations()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2192
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2193
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2194
// Rewrite constant pool references in the method's stackmap table.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2195
// These "structures" are adapted from the StackMapTable_attribute that
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2196
// is described in section 4.8.4 of the 6.0 version of the VM spec
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2197
// (dated 2005.10.26):
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2198
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2199
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2200
// stack_map {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2201
//   u2 number_of_entries;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2202
//   stack_map_frame entries[number_of_entries];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2203
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2204
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2205
void VM_RedefineClasses::rewrite_cp_refs_in_stack_map_table(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2206
       methodHandle method, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2207
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2208
  if (!method->has_stackmap_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2209
    return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2210
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2211
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2212
  AnnotationArray* stackmap_data = method->stackmap_data();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2213
  address stackmap_p = (address)stackmap_data->adr_at(0);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2214
  address stackmap_end = stackmap_p + stackmap_data->length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2215
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2216
  assert(stackmap_p + 2 <= stackmap_end, "no room for number_of_entries");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2217
  u2 number_of_entries = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2218
  stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2219
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2220
  RC_TRACE_WITH_THREAD(0x04000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2221
    ("number_of_entries=%u", number_of_entries));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2222
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2223
  // walk through each stack_map_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2224
  u2 calc_number_of_entries = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2225
  for (; calc_number_of_entries < number_of_entries; calc_number_of_entries++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2226
    // The stack_map_frame structure is a u1 frame_type followed by
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2227
    // 0 or more bytes of data:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2228
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2229
    // union stack_map_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2230
    //   same_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2231
    //   same_locals_1_stack_item_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2232
    //   same_locals_1_stack_item_frame_extended;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2233
    //   chop_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2234
    //   same_frame_extended;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2235
    //   append_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2236
    //   full_frame;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2237
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2238
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2239
    assert(stackmap_p + 1 <= stackmap_end, "no room for frame_type");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2240
    // The Linux compiler does not like frame_type to be u1 or u2. It
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2241
    // issues the following warning for the first if-statement below:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2242
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2243
    // "warning: comparison is always true due to limited range of data type"
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2244
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2245
    u4 frame_type = *stackmap_p;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2246
    stackmap_p++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2247
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2248
    // same_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2249
    //   u1 frame_type = SAME; /* 0-63 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2250
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2251
    if (frame_type >= 0 && frame_type <= 63) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2252
      // nothing more to do for same_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2253
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2254
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2255
    // same_locals_1_stack_item_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2256
    //   u1 frame_type = SAME_LOCALS_1_STACK_ITEM; /* 64-127 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2257
    //   verification_type_info stack[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2258
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2259
    else if (frame_type >= 64 && frame_type <= 127) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2260
      rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2261
        calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2262
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2263
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2264
    // reserved for future use
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2265
    else if (frame_type >= 128 && frame_type <= 246) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2266
      // nothing more to do for reserved frame_types
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2267
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2268
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2269
    // same_locals_1_stack_item_frame_extended {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2270
    //   u1 frame_type = SAME_LOCALS_1_STACK_ITEM_EXTENDED; /* 247 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2271
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2272
    //   verification_type_info stack[1];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2273
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2274
    else if (frame_type == 247) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2275
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2276
      rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2277
        calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2278
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2279
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2280
    // chop_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2281
    //   u1 frame_type = CHOP; /* 248-250 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2282
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2283
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2284
    else if (frame_type >= 248 && frame_type <= 250) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2285
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2286
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2287
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2288
    // same_frame_extended {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2289
    //   u1 frame_type = SAME_FRAME_EXTENDED; /* 251*/
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2290
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2291
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2292
    else if (frame_type == 251) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2293
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2294
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2295
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2296
    // append_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2297
    //   u1 frame_type = APPEND; /* 252-254 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2298
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2299
    //   verification_type_info locals[frame_type - 251];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2300
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2301
    else if (frame_type >= 252 && frame_type <= 254) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2302
      assert(stackmap_p + 2 <= stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2303
        "no room for offset_delta");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2304
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2305
      u1 len = frame_type - 251;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2306
      for (u1 i = 0; i < len; i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2307
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2308
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2309
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2310
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2311
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2312
    // full_frame {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2313
    //   u1 frame_type = FULL_FRAME; /* 255 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2314
    //   u2 offset_delta;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2315
    //   u2 number_of_locals;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2316
    //   verification_type_info locals[number_of_locals];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2317
    //   u2 number_of_stack_items;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2318
    //   verification_type_info stack[number_of_stack_items];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2319
    // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2320
    else if (frame_type == 255) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2321
      assert(stackmap_p + 2 + 2 <= stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2322
        "no room for smallest full_frame");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2323
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2324
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2325
      u2 number_of_locals = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2326
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2327
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2328
      for (u2 locals_i = 0; locals_i < number_of_locals; locals_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2329
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2330
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2331
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2332
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2333
      // Use the largest size for the number_of_stack_items, but only get
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2334
      // the right number of bytes.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2335
      u2 number_of_stack_items = Bytes::get_Java_u2(stackmap_p);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2336
      stackmap_p += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2337
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2338
      for (u2 stack_i = 0; stack_i < number_of_stack_items; stack_i++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2339
        rewrite_cp_refs_in_verification_type_info(stackmap_p, stackmap_end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2340
          calc_number_of_entries, frame_type, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2341
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2342
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2343
  } // end while there is a stack_map_frame
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2344
  assert(number_of_entries == calc_number_of_entries, "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2345
} // end rewrite_cp_refs_in_stack_map_table()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2346
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2347
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2348
// Rewrite constant pool references in the verification type info
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2349
// portion of the method's stackmap table. These "structures" are
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2350
// adapted from the StackMapTable_attribute that is described in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2351
// section 4.8.4 of the 6.0 version of the VM spec (dated 2005.10.26):
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2352
// file:///net/quincunx.sfbay/export/gbracha/ClassFile-Java6.pdf
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2353
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2354
// The verification_type_info structure is a u1 tag followed by 0 or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2355
// more bytes of data:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2356
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2357
// union verification_type_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2358
//   Top_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2359
//   Integer_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2360
//   Float_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2361
//   Long_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2362
//   Double_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2363
//   Null_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2364
//   UninitializedThis_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2365
//   Object_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2366
//   Uninitialized_variable_info;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2367
// }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2368
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2369
void VM_RedefineClasses::rewrite_cp_refs_in_verification_type_info(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2370
       address& stackmap_p_ref, address stackmap_end, u2 frame_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2371
       u1 frame_type, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2372
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2373
  assert(stackmap_p_ref + 1 <= stackmap_end, "no room for tag");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2374
  u1 tag = *stackmap_p_ref;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2375
  stackmap_p_ref++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2376
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2377
  switch (tag) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2378
  // Top_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2379
  //   u1 tag = ITEM_Top; /* 0 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2380
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2381
  // verificationType.hpp has zero as ITEM_Bogus instead of ITEM_Top
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2382
  case 0:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2383
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2384
  // Integer_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2385
  //   u1 tag = ITEM_Integer; /* 1 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2386
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2387
  case ITEM_Integer:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2388
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2389
  // Float_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2390
  //   u1 tag = ITEM_Float; /* 2 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2391
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2392
  case ITEM_Float:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2393
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2394
  // Double_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2395
  //   u1 tag = ITEM_Double; /* 3 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2396
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2397
  case ITEM_Double:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2398
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2399
  // Long_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2400
  //   u1 tag = ITEM_Long; /* 4 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2401
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2402
  case ITEM_Long:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2403
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2404
  // Null_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2405
  //   u1 tag = ITEM_Null; /* 5 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2406
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2407
  case ITEM_Null:  // fall through
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2408
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2409
  // UninitializedThis_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2410
  //   u1 tag = ITEM_UninitializedThis; /* 6 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2411
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2412
  case ITEM_UninitializedThis:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2413
    // nothing more to do for the above tag types
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2414
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2415
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2416
  // Object_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2417
  //   u1 tag = ITEM_Object; /* 7 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2418
  //   u2 cpool_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2419
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2420
  case ITEM_Object:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2421
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2422
    assert(stackmap_p_ref + 2 <= stackmap_end, "no room for cpool_index");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2423
    u2 cpool_index = Bytes::get_Java_u2(stackmap_p_ref);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2424
    u2 new_cp_index = find_new_index(cpool_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2425
    if (new_cp_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2426
      RC_TRACE_WITH_THREAD(0x04000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2427
        ("mapped old cpool_index=%d", cpool_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2428
      Bytes::put_Java_u2(stackmap_p_ref, new_cp_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2429
      cpool_index = new_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2430
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2431
    stackmap_p_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2432
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2433
    RC_TRACE_WITH_THREAD(0x04000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2434
      ("frame_i=%u, frame_type=%u, cpool_index=%d", frame_i,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2435
      frame_type, cpool_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2436
  } break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2437
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2438
  // Uninitialized_variable_info {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2439
  //   u1 tag = ITEM_Uninitialized; /* 8 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2440
  //   u2 offset;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2441
  // }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2442
  case ITEM_Uninitialized:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2443
    assert(stackmap_p_ref + 2 <= stackmap_end, "no room for offset");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2444
    stackmap_p_ref += 2;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2445
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2446
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2447
  default:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2448
    RC_TRACE_WITH_THREAD(0x04000000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2449
      ("frame_i=%u, frame_type=%u, bad tag=0x%x", frame_i, frame_type, tag));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2450
    ShouldNotReachHere();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2451
    break;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2452
  } // end switch (tag)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2453
} // end rewrite_cp_refs_in_verification_type_info()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2454
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2455
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2456
// Change the constant pool associated with klass scratch_class to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2457
// scratch_cp. If shrink is true, then scratch_cp_length elements
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2458
// are copied from scratch_cp to a smaller constant pool and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2459
// smaller constant pool is associated with scratch_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2460
void VM_RedefineClasses::set_new_constant_pool(
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2461
       ClassLoaderData* loader_data,
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2462
       instanceKlassHandle scratch_class, constantPoolHandle scratch_cp,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2463
       int scratch_cp_length, TRAPS) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2464
  assert(scratch_cp->length() >= scratch_cp_length, "sanity check");
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2465
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2466
  // scratch_cp is a merged constant pool and has enough space for a
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2467
  // worst case merge situation. We want to associate the minimum
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2468
  // sized constant pool with the klass to save space.
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2469
  constantPoolHandle smaller_cp(THREAD,
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2470
          ConstantPool::allocate(loader_data, scratch_cp_length, THREAD));
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2471
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2472
  // preserve version() value in the smaller copy
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2473
  int version = scratch_cp->version();
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2474
  assert(version != 0, "sanity check");
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2475
  smaller_cp->set_version(version);
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2476
15433
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  2477
  // attach klass to new constant pool
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  2478
  // reference to the cp holder is needed for copy_operands()
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  2479
  smaller_cp->set_pool_holder(scratch_class());
0f53fd973576 8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
sspitsyn
parents: 15430
diff changeset
  2480
15229
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2481
  scratch_cp->copy_cp_to(1, scratch_cp_length - 1, smaller_cp, 1, THREAD);
5341188db763 7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents: 15099
diff changeset
  2482
  scratch_cp = smaller_cp;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2483
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2484
  // attach new constant pool to klass
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2485
  scratch_class->set_constants(scratch_cp());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2486
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2487
  int i;  // for portability
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2488
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2489
  // update each field in klass to use new constant pool indices as needed
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2490
  for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) {
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2491
    jshort cur_index = fs.name_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2492
    jshort new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2493
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2494
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2495
        ("field-name_index change: %d to %d", cur_index, new_index));
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2496
      fs.set_name_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2497
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2498
    cur_index = fs.signature_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2499
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2500
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2501
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2502
        ("field-signature_index change: %d to %d", cur_index, new_index));
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2503
      fs.set_signature_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2504
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2505
    cur_index = fs.initval_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2506
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2507
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2508
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2509
        ("field-initval_index change: %d to %d", cur_index, new_index));
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2510
      fs.set_initval_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2511
    }
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2512
    cur_index = fs.generic_signature_index();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2513
    new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2514
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2515
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2516
        ("field-generic_signature change: %d to %d", cur_index, new_index));
10546
e79347eebbc5 7086585: make Java field injection more flexible
never
parents: 9971
diff changeset
  2517
      fs.set_generic_signature_index(new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2518
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2519
  } // end for each field
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2520
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2521
  // Update constant pool indices in the inner classes info to use
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2522
  // new constant indices as needed. The inner classes info is a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2523
  // quadruple:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2524
  // (inner_class_info, outer_class_info, inner_name, inner_access_flags)
12231
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2525
  InnerClassesIterator iter(scratch_class);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2526
  for (; !iter.done(); iter.next()) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2527
    int cur_index = iter.inner_class_info_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2528
    if (cur_index == 0) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2529
      continue;  // JVM spec. allows null inner class refs so skip it
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2530
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2531
    int new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2532
    if (new_index != 0) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2533
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2534
        ("inner_class_info change: %d to %d", cur_index, new_index));
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2535
      iter.set_inner_class_info_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2536
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2537
    cur_index = iter.outer_class_info_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2538
    new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2539
    if (new_index != 0) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2540
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2541
        ("outer_class_info change: %d to %d", cur_index, new_index));
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2542
      iter.set_outer_class_info_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2543
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2544
    cur_index = iter.inner_name_index();
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2545
    new_index = find_new_index(cur_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2546
    if (new_index != 0) {
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2547
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2548
        ("inner_name change: %d to %d", cur_index, new_index));
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2549
      iter.set_inner_name_index(new_index);
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2550
    }
6a9cfc59a18a 7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents: 11399
diff changeset
  2551
  } // end for each inner class
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2552
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2553
  // Attach each method in klass to the new constant pool and update
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2554
  // to use new constant pool indices as needed:
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2555
  Array<Method*>* methods = scratch_class->methods();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2556
  for (i = methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2557
    methodHandle method(THREAD, methods->at(i));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2558
    method->set_constants(scratch_cp());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2559
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2560
    int new_index = find_new_index(method->name_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2561
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2562
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2563
        ("method-name_index change: %d to %d", method->name_index(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2564
        new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2565
      method->set_name_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2566
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2567
    new_index = find_new_index(method->signature_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2568
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2569
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2570
        ("method-signature_index change: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2571
        method->signature_index(), new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2572
      method->set_signature_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2573
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2574
    new_index = find_new_index(method->generic_signature_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2575
    if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2576
      RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2577
        ("method-generic_signature_index change: %d to %d",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2578
        method->generic_signature_index(), new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2579
      method->set_generic_signature_index(new_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2580
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2581
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2582
    // Update constant pool indices in the method's checked exception
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2583
    // table to use new constant indices as needed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2584
    int cext_length = method->checked_exceptions_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2585
    if (cext_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2586
      CheckedExceptionElement * cext_table =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2587
        method->checked_exceptions_start();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2588
      for (int j = 0; j < cext_length; j++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2589
        int cur_index = cext_table[j].class_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2590
        int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2591
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2592
          RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2593
            ("cext-class_cp_index change: %d to %d", cur_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2594
          cext_table[j].class_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2595
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2596
      } // end for each checked exception table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2597
    } // end if there are checked exception table entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2598
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2599
    // Update each catch type index in the method's exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2600
    // to use new constant pool indices as needed. The exception table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2601
    // holds quadruple entries of the form:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2602
    //   (beg_bci, end_bci, handler_bci, klass_index)
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2603
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2604
    ExceptionTable ex_table(method());
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2605
    int ext_length = ex_table.length();
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2606
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2607
    for (int j = 0; j < ext_length; j ++) {
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2608
      int cur_index = ex_table.catch_type_index(j);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2609
      int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2610
      if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2611
        RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2612
          ("ext-klass_index change: %d to %d", cur_index, new_index));
13282
9872915dd78d 7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
jiangli
parents: 12231
diff changeset
  2613
        ex_table.set_catch_type_index(j, new_index);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2614
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2615
    } // end for each exception table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2616
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2617
    // Update constant pool indices in the method's local variable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2618
    // table to use new constant indices as needed. The local variable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2619
    // table hold sextuple entries of the form:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2620
    // (start_pc, length, name_index, descriptor_index, signature_index, slot)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2621
    int lvt_length = method->localvariable_table_length();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2622
    if (lvt_length > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2623
      LocalVariableTableElement * lv_table =
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2624
        method->localvariable_table_start();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2625
      for (int j = 0; j < lvt_length; j++) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2626
        int cur_index = lv_table[j].name_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2627
        int new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2628
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2629
          RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2630
            ("lvt-name_cp_index change: %d to %d", cur_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2631
          lv_table[j].name_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2632
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2633
        cur_index = lv_table[j].descriptor_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2634
        new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2635
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2636
          RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2637
            ("lvt-descriptor_cp_index change: %d to %d", cur_index,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2638
            new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2639
          lv_table[j].descriptor_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2640
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2641
        cur_index = lv_table[j].signature_cp_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2642
        new_index = find_new_index(cur_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2643
        if (new_index != 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2644
          RC_TRACE_WITH_THREAD(0x00080000, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2645
            ("lvt-signature_cp_index change: %d to %d", cur_index, new_index));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2646
          lv_table[j].signature_cp_index = (u2)new_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2647
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2648
      } // end for each local variable table entry
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2649
    } // end if there are local variable table entries
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2650
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2651
    rewrite_cp_refs_in_stack_map_table(method, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2652
  } // end for each method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2653
} // end set_new_constant_pool()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2654
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2655
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2656
// Unevolving classes may point to methods of the_class directly
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2657
// from their constant pool caches, itables, and/or vtables. We
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2658
// use the ClassLoaderDataGraph::classes_do() facility and this helper
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2659
// to fix up these pointers.
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2660
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2661
// Adjust cpools and vtables closure
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2662
void VM_RedefineClasses::AdjustCpoolCacheAndVtable::do_klass(Klass* k) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2663
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2664
  // This is a very busy routine. We don't want too much tracing
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2665
  // printed out.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2666
  bool trace_name_printed = false;
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2667
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2668
  // Very noisy: only enable this call if you are trying to determine
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2669
  // that a specific class gets found by this routine.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2670
  // RC_TRACE macro has an embedded ResourceMark
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2671
  // RC_TRACE_WITH_THREAD(0x00100000, THREAD,
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2672
  //   ("adjust check: name=%s", k->external_name()));
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2673
  // trace_name_printed = true;
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2674
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2675
  // If the class being redefined is java.lang.Object, we need to fix all
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2676
  // array class vtables also
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2677
  if (k->oop_is_array() && _the_class_oop == SystemDictionary::Object_klass()) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2678
    k->vtable()->adjust_method_entries(_matching_old_methods,
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2679
                                       _matching_new_methods,
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2680
                                       _matching_methods_length,
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2681
                                       &trace_name_printed);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2682
  } else if (k->oop_is_instance()) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2683
    HandleMark hm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2684
    InstanceKlass *ik = InstanceKlass::cast(k);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2685
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2686
    // HotSpot specific optimization! HotSpot does not currently
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2687
    // support delegation from the bootstrap class loader to a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2688
    // user-defined class loader. This means that if the bootstrap
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2689
    // class loader is the initiating class loader, then it will also
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2690
    // be the defining class loader. This also means that classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2691
    // loaded by the bootstrap class loader cannot refer to classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2692
    // loaded by a user-defined class loader. Note: a user-defined
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2693
    // class loader can delegate to the bootstrap class loader.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2694
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2695
    // If the current class being redefined has a user-defined class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2696
    // loader as its defining class loader, then we can skip all
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2697
    // classes loaded by the bootstrap class loader.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2698
    bool is_user_defined =
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2699
           InstanceKlass::cast(_the_class_oop)->class_loader() != NULL;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2700
    if (is_user_defined && ik->class_loader() == NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2701
      return;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2702
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2703
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2704
    // Fix the vtable embedded in the_class and subclasses of the_class,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2705
    // if one exists. We discard scratch_class and we don't keep an
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2706
    // InstanceKlass around to hold obsolete methods so we don't have
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2707
    // any other InstanceKlass embedded vtables to update. The vtable
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2708
    // holds the Method*s for virtual (but not final) methods.
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2709
    if (ik->vtable_length() > 0 && ik->is_subtype_of(_the_class_oop)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2710
      // ik->vtable() creates a wrapper object; rm cleans it up
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2711
      ResourceMark rm(_thread);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2712
      ik->vtable()->adjust_method_entries(_matching_old_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2713
                                          _matching_new_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2714
                                          _matching_methods_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2715
                                          &trace_name_printed);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2716
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2717
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2718
    // If the current class has an itable and we are either redefining an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2719
    // interface or if the current class is a subclass of the_class, then
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2720
    // we potentially have to fix the itable. If we are redefining an
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2721
    // interface, then we have to call adjust_method_entries() for
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2722
    // every InstanceKlass that has an itable since there isn't a
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2723
    // subclass relationship between an interface and an InstanceKlass.
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
  2724
    if (ik->itable_length() > 0 && (_the_class_oop->is_interface()
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2725
        || ik->is_subclass_of(_the_class_oop))) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2726
      // ik->itable() creates a wrapper object; rm cleans it up
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2727
      ResourceMark rm(_thread);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2728
      ik->itable()->adjust_method_entries(_matching_old_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2729
                                          _matching_new_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2730
                                          _matching_methods_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2731
                                          &trace_name_printed);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2732
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2733
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2734
    // The constant pools in other classes (other_cp) can refer to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2735
    // methods in the_class. We have to update method information in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2736
    // other_cp's cache. If other_cp has a previous version, then we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2737
    // have to repeat the process for each previous version. The
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2738
    // constant pool cache holds the Method*s for non-virtual
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2739
    // methods and for virtual, final methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2740
    //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2741
    // Special case: if the current class is the_class, then new_cp
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2742
    // has already been attached to the_class and old_cp has already
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2743
    // been added as a previous version. The new_cp doesn't have any
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2744
    // cached references to old methods so it doesn't need to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2745
    // updated. We can simply start with the previous version(s) in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2746
    // that case.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2747
    constantPoolHandle other_cp;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2748
    ConstantPoolCache* cp_cache;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2749
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2750
    if (ik != _the_class_oop) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2751
      // this klass' constant pool cache may need adjustment
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2752
      other_cp = constantPoolHandle(ik->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2753
      cp_cache = other_cp->cache();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2754
      if (cp_cache != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2755
        cp_cache->adjust_method_entries(_matching_old_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2756
                                        _matching_new_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2757
                                        _matching_methods_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2758
                                        &trace_name_printed);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2759
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2760
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2761
    {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  2762
      ResourceMark rm(_thread);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2763
      // PreviousVersionInfo objects returned via PreviousVersionWalker
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2764
      // contain a GrowableArray of handles. We have to clean up the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2765
      // GrowableArray _after_ the PreviousVersionWalker destructor
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2766
      // has destroyed the handles.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2767
      {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2768
        // the previous versions' constant pool caches may need adjustment
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2769
        PreviousVersionWalker pvw(ik);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2770
        for (PreviousVersionInfo * pv_info = pvw.next_previous_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2771
             pv_info != NULL; pv_info = pvw.next_previous_version()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2772
          other_cp = pv_info->prev_constant_pool_handle();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2773
          cp_cache = other_cp->cache();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2774
          if (cp_cache != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2775
            cp_cache->adjust_method_entries(_matching_old_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2776
                                            _matching_new_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2777
                                            _matching_methods_length,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2778
                                            &trace_name_printed);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2779
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2780
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2781
      } // pvw is cleaned up
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2782
    } // rm is cleaned up
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2783
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2784
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2785
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2786
void VM_RedefineClasses::update_jmethod_ids() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2787
  for (int j = 0; j < _matching_methods_length; ++j) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2788
    Method* old_method = _matching_old_methods[j];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2789
    jmethodID jmid = old_method->find_jmethod_id_or_null();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2790
    if (jmid != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2791
      // There is a jmethodID, change it to point to the new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2792
      methodHandle new_method_h(_matching_new_methods[j]);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2793
      Method::change_method_associated_with_jmethod_id(jmid, new_method_h());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2794
      assert(Method::resolve_jmethod_id(jmid) == _matching_new_methods[j],
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2795
             "should be replaced");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2796
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2797
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2798
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2799
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2800
void VM_RedefineClasses::check_methods_and_mark_as_obsolete(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2801
       BitMap *emcp_methods, int * emcp_method_count_p) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2802
  *emcp_method_count_p = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2803
  int obsolete_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2804
  int old_index = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2805
  for (int j = 0; j < _matching_methods_length; ++j, ++old_index) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2806
    Method* old_method = _matching_old_methods[j];
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2807
    Method* new_method = _matching_new_methods[j];
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2808
    Method* old_array_method;
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2809
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2810
    // Maintain an old_index into the _old_methods array by skipping
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2811
    // deleted methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2812
    while ((old_array_method = _old_methods->at(old_index)) != old_method) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2813
      ++old_index;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2814
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2815
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2816
    if (MethodComparator::methods_EMCP(old_method, new_method)) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2817
      // The EMCP definition from JSR-163 requires the bytecodes to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2818
      // the same with the exception of constant pool indices which may
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2819
      // differ. However, the constants referred to by those indices
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2820
      // must be the same.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2821
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2822
      // We use methods_EMCP() for comparison since constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2823
      // merging can remove duplicate constant pool entries that were
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2824
      // present in the old method and removed from the rewritten new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2825
      // method. A faster binary comparison function would consider the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2826
      // old and new methods to be different when they are actually
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2827
      // EMCP.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2828
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2829
      // The old and new methods are EMCP and you would think that we
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2830
      // could get rid of one of them here and now and save some space.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2831
      // However, the concept of EMCP only considers the bytecodes and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2832
      // the constant pool entries in the comparison. Other things,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2833
      // e.g., the line number table (LNT) or the local variable table
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2834
      // (LVT) don't count in the comparison. So the new (and EMCP)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2835
      // method can have a new LNT that we need so we can't just
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2836
      // overwrite the new method with the old method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2837
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2838
      // When this routine is called, we have already attached the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2839
      // methods to the_class so the old methods are effectively
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2840
      // overwritten. However, if an old method is still executing,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2841
      // then the old method cannot be collected until sometime after
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2842
      // the old method call has returned. So the overwriting of old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2843
      // methods by new methods will save us space except for those
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2844
      // (hopefully few) old methods that are still executing.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2845
      //
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2846
      // A method refers to a ConstMethod* and this presents another
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2847
      // possible avenue to space savings. The ConstMethod* in the
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2848
      // new method contains possibly new attributes (LNT, LVT, etc).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2849
      // At first glance, it seems possible to save space by replacing
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2850
      // the ConstMethod* in the old method with the ConstMethod*
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2851
      // from the new method. The old and new methods would share the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2852
      // same ConstMethod* and we would save the space occupied by
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2853
      // the old ConstMethod*. However, the ConstMethod* contains
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2854
      // a back reference to the containing method. Sharing the
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2855
      // ConstMethod* between two methods could lead to confusion in
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2856
      // the code that uses the back reference. This would lead to
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2857
      // brittle code that could be broken in non-obvious ways now or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2858
      // in the future.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2859
      //
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2860
      // Another possibility is to copy the ConstMethod* from the new
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2861
      // method to the old method and then overwrite the new method with
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2862
      // the old method. Since the ConstMethod* contains the bytecodes
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2863
      // for the method embedded in the oop, this option would change
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2864
      // the bytecodes out from under any threads executing the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2865
      // method and make the thread's bcp invalid. Since EMCP requires
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2866
      // that the bytecodes be the same modulo constant pool indices, it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2867
      // is straight forward to compute the correct new bcp in the new
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2868
      // ConstMethod* from the old bcp in the old ConstMethod*. The
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2869
      // time consuming part would be searching all the frames in all
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2870
      // of the threads to find all of the calls to the old method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2871
      //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2872
      // It looks like we will have to live with the limited savings
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2873
      // that we get from effectively overwriting the old methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2874
      // when the new methods are attached to the_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2875
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2876
      // track which methods are EMCP for add_previous_version() call
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2877
      emcp_methods->set_bit(old_index);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2878
      (*emcp_method_count_p)++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2879
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2880
      // An EMCP method is _not_ obsolete. An obsolete method has a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2881
      // different jmethodID than the current method. An EMCP method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2882
      // has the same jmethodID as the current method. Having the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2883
      // same jmethodID for all EMCP versions of a method allows for
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2884
      // a consistent view of the EMCP methods regardless of which
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2885
      // EMCP method you happen to have in hand. For example, a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2886
      // breakpoint set in one EMCP method will work for all EMCP
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2887
      // versions of the method including the current one.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2888
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2889
      // mark obsolete methods as such
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2890
      old_method->set_is_obsolete();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2891
      obsolete_count++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2892
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2893
      // obsolete methods need a unique idnum
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2894
      u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum();
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2895
      if (num != ConstMethod::UNSET_IDNUM) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2896
//      u2 old_num = old_method->method_idnum();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2897
        old_method->set_method_idnum(num);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2898
// TO DO: attach obsolete annotations to obsolete method's new idnum
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2899
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2900
      // With tracing we try not to "yack" too much. The position of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2901
      // this trace assumes there are fewer obsolete methods than
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2902
      // EMCP methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2903
      RC_TRACE(0x00000100, ("mark %s(%s) as obsolete",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2904
        old_method->name()->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2905
        old_method->signature()->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2906
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2907
    old_method->set_is_old();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2908
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2909
  for (int i = 0; i < _deleted_methods_length; ++i) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2910
    Method* old_method = _deleted_methods[i];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2911
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2912
    assert(old_method->vtable_index() < 0,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2913
           "cannot delete methods with vtable entries");;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2914
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2915
    // Mark all deleted methods as old and obsolete
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2916
    old_method->set_is_old();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2917
    old_method->set_is_obsolete();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2918
    ++obsolete_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2919
    // With tracing we try not to "yack" too much. The position of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2920
    // this trace assumes there are fewer obsolete methods than
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2921
    // EMCP methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2922
    RC_TRACE(0x00000100, ("mark deleted %s(%s) as obsolete",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2923
                          old_method->name()->as_C_string(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2924
                          old_method->signature()->as_C_string()));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2925
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2926
  assert((*emcp_method_count_p + obsolete_count) == _old_methods->length(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2927
    "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2928
  RC_TRACE(0x00000100, ("EMCP_cnt=%d, obsolete_cnt=%d", *emcp_method_count_p,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2929
    obsolete_count));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2930
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2931
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2932
// This internal class transfers the native function registration from old methods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2933
// to new methods.  It is designed to handle both the simple case of unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2934
// native methods and the complex cases of native method prefixes being added and/or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2935
// removed.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2936
// It expects only to be used during the VM_RedefineClasses op (a safepoint).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2937
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2938
// This class is used after the new methods have been installed in "the_class".
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2939
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2940
// So, for example, the following must be handled.  Where 'm' is a method and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2941
// a number followed by an underscore is a prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2942
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2943
//                                      Old Name    New Name
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2944
// Simple transfer to new method        m       ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2945
// Add prefix                           m       ->  1_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2946
// Remove prefix                        1_m     ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2947
// Simultaneous add of prefixes         m       ->  3_2_1_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2948
// Simultaneous removal of prefixes     3_2_1_m ->  m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2949
// Simultaneous add and remove          1_m     ->  2_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2950
// Same, caused by prefix removal only  3_2_1_m ->  3_2_m
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2951
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2952
class TransferNativeFunctionRegistration {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2953
 private:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2954
  instanceKlassHandle the_class;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2955
  int prefix_count;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2956
  char** prefixes;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2957
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2958
  // Recursively search the binary tree of possibly prefixed method names.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2959
  // Iteration could be used if all agents were well behaved. Full tree walk is
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2960
  // more resilent to agents not cleaning up intermediate methods.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2961
  // Branch at each depth in the binary tree is:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2962
  //    (1) without the prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2963
  //    (2) with the prefix.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2964
  // where 'prefix' is the prefix at that 'depth' (first prefix, second prefix,...)
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  2965
  Method* search_prefix_name_space(int depth, char* name_str, size_t name_len,
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  2966
                                     Symbol* signature) {
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  2967
    TempNewSymbol name_symbol = SymbolTable::probe(name_str, (int)name_len);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2968
    if (name_symbol != NULL) {
14488
ab48109f7d1b 8001471: Klass::cast() does nothing
hseigel
parents: 13952
diff changeset
  2969
      Method* method = the_class()->lookup_method(name_symbol, signature);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2970
      if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2971
        // Even if prefixed, intermediate methods must exist.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2972
        if (method->is_native()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2973
          // Wahoo, we found a (possibly prefixed) version of the method, return it.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2974
          return method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2975
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2976
        if (depth < prefix_count) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2977
          // Try applying further prefixes (other than this one).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2978
          method = search_prefix_name_space(depth+1, name_str, name_len, signature);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2979
          if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2980
            return method; // found
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2981
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2982
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2983
          // Try adding this prefix to the method name and see if it matches
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2984
          // another method name.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2985
          char* prefix = prefixes[depth];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2986
          size_t prefix_len = strlen(prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2987
          size_t trial_len = name_len + prefix_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2988
          char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2989
          strcpy(trial_name_str, prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2990
          strcat(trial_name_str, name_str);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2991
          method = search_prefix_name_space(depth+1, trial_name_str, trial_len,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2992
                                            signature);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2993
          if (method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2994
            // If found along this branch, it was prefixed, mark as such
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2995
            method->set_is_prefixed_native();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2996
            return method; // found
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2997
          }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2998
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  2999
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3000
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3001
    return NULL;  // This whole branch bore nothing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3002
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3003
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3004
  // Return the method name with old prefixes stripped away.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3005
  char* method_name_without_prefixes(Method* method) {
8076
96d498ec7ae1 6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents: 7913
diff changeset
  3006
    Symbol* name = method->name();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3007
    char* name_str = name->as_utf8();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3008
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3009
    // Old prefixing may be defunct, strip prefixes, if any.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3010
    for (int i = prefix_count-1; i >= 0; i--) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3011
      char* prefix = prefixes[i];
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3012
      size_t prefix_len = strlen(prefix);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3013
      if (strncmp(prefix, name_str, prefix_len) == 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3014
        name_str += prefix_len;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3015
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3016
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3017
    return name_str;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3018
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3019
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3020
  // Strip any prefixes off the old native method, then try to find a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3021
  // (possibly prefixed) new native that matches it.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3022
  Method* strip_and_search_for_new_native(Method* method) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3023
    ResourceMark rm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3024
    char* name_str = method_name_without_prefixes(method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3025
    return search_prefix_name_space(0, name_str, strlen(name_str),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3026
                                    method->signature());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3027
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3028
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3029
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3030
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3031
  // Construct a native method transfer processor for this class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3032
  TransferNativeFunctionRegistration(instanceKlassHandle _the_class) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3033
    assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3034
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3035
    the_class = _the_class;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3036
    prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3037
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3038
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3039
  // Attempt to transfer any of the old or deleted methods that are native
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3040
  void transfer_registrations(Method** old_methods, int methods_length) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3041
    for (int j = 0; j < methods_length; j++) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3042
      Method* old_method = old_methods[j];
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3043
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3044
      if (old_method->is_native() && old_method->has_native_function()) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3045
        Method* new_method = strip_and_search_for_new_native(old_method);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3046
        if (new_method != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3047
          // Actually set the native function in the new method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3048
          // Redefine does not send events (except CFLH), certainly not this
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3049
          // behind the scenes re-registration.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3050
          new_method->set_native_function(old_method->native_function(),
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3051
                              !Method::native_bind_event_is_interesting);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3052
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3053
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3054
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3055
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3056
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3057
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3058
// Don't lose the association between a native method and its JNI function.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3059
void VM_RedefineClasses::transfer_old_native_function_registrations(instanceKlassHandle the_class) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3060
  TransferNativeFunctionRegistration transfer(the_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3061
  transfer.transfer_registrations(_deleted_methods, _deleted_methods_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3062
  transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3063
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3064
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3065
// Deoptimize all compiled code that depends on this class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3066
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3067
// If the can_redefine_classes capability is obtained in the onload
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3068
// phase then the compiler has recorded all dependencies from startup.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3069
// In that case we need only deoptimize and throw away all compiled code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3070
// that depends on the class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3071
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3072
// If can_redefine_classes is obtained sometime after the onload
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3073
// phase then the dependency information may be incomplete. In that case
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3074
// the first call to RedefineClasses causes all compiled code to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3075
// thrown away. As can_redefine_classes has been obtained then
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3076
// all future compilations will record dependencies so second and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3077
// subsequent calls to RedefineClasses need only throw away code
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3078
// that depends on the class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3079
//
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3080
void VM_RedefineClasses::flush_dependent_code(instanceKlassHandle k_h, TRAPS) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3081
  assert_locked_or_safepoint(Compile_lock);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3082
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3083
  // All dependencies have been recorded from startup or this is a second or
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3084
  // subsequent use of RedefineClasses
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3085
  if (JvmtiExport::all_dependencies_are_recorded()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3086
    Universe::flush_evol_dependents_on(k_h);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3087
  } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3088
    CodeCache::mark_all_nmethods_for_deoptimization();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3089
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3090
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3091
    DeoptimizationMarker dm;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3092
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3093
    // Deoptimize all activations depending on marked nmethods
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3094
    Deoptimization::deoptimize_dependents();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3095
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3096
    // Make the dependent methods not entrant (in VM_Deoptimize they are made zombies)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3097
    CodeCache::make_marked_nmethods_not_entrant();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3098
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3099
    // From now on we know that the dependency information is complete
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3100
    JvmtiExport::set_all_dependencies_are_recorded(true);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3101
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3102
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3103
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3104
void VM_RedefineClasses::compute_added_deleted_matching_methods() {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3105
  Method* old_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3106
  Method* new_method;
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3107
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3108
  _matching_old_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3109
  _matching_new_methods = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3110
  _added_methods        = NEW_RESOURCE_ARRAY(Method*, _new_methods->length());
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3111
  _deleted_methods      = NEW_RESOURCE_ARRAY(Method*, _old_methods->length());
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3112
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3113
  _matching_methods_length = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3114
  _deleted_methods_length  = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3115
  _added_methods_length    = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3116
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3117
  int nj = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3118
  int oj = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3119
  while (true) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3120
    if (oj >= _old_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3121
      if (nj >= _new_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3122
        break; // we've looked at everything, done
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3123
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3124
      // New method at the end
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3125
      new_method = _new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3126
      _added_methods[_added_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3127
      ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3128
    } else if (nj >= _new_methods->length()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3129
      // Old method, at the end, is deleted
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3130
      old_method = _old_methods->at(oj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3131
      _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3132
      ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3133
    } else {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3134
      old_method = _old_methods->at(oj);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3135
      new_method = _new_methods->at(nj);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3136
      if (old_method->name() == new_method->name()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3137
        if (old_method->signature() == new_method->signature()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3138
          _matching_old_methods[_matching_methods_length  ] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3139
          _matching_new_methods[_matching_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3140
          ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3141
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3142
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3143
          // added overloaded have already been moved to the end,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3144
          // so this is a deleted overloaded method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3145
          _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3146
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3147
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3148
      } else { // names don't match
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3149
        if (old_method->name()->fast_compare(new_method->name()) > 0) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3150
          // new method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3151
          _added_methods[_added_methods_length++] = new_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3152
          ++nj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3153
        } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3154
          // deleted method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3155
          _deleted_methods[_deleted_methods_length++] = old_method;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3156
          ++oj;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3157
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3158
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3159
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3160
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3161
  assert(_matching_methods_length + _deleted_methods_length == _old_methods->length(), "sanity");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3162
  assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity");
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3163
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3164
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3165
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3166
void VM_RedefineClasses::swap_annotations(instanceKlassHandle the_class,
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3167
                                          instanceKlassHandle scratch_class) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3168
  // Since there is currently no rewriting of type annotations indexes
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3169
  // into the CP, we null out type annotations on scratch_class before
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3170
  // we swap annotations with the_class rather than facing the
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3171
  // possibility of shipping annotations with broken indexes to
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3172
  // Java-land.
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3173
  ClassLoaderData* loader_data = scratch_class->class_loader_data();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3174
  AnnotationArray* new_class_type_annotations = scratch_class->class_type_annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3175
  if (new_class_type_annotations != NULL) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3176
    MetadataFactory::free_array<u1>(loader_data, new_class_type_annotations);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3177
    scratch_class->annotations()->set_class_type_annotations(NULL);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3178
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3179
  Array<AnnotationArray*>* new_field_type_annotations = scratch_class->fields_type_annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3180
  if (new_field_type_annotations != NULL) {
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3181
    Annotations::free_contents(loader_data, new_field_type_annotations);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3182
    scratch_class->annotations()->set_fields_type_annotations(NULL);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3183
  }
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3184
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3185
  // Swap annotation fields values
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3186
  Annotations* old_annotations = the_class->annotations();
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3187
  the_class->set_annotations(scratch_class->annotations());
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3188
  scratch_class->set_annotations(old_annotations);
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3189
}
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3190
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3191
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3192
// Install the redefinition of a class:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3193
//    - house keeping (flushing breakpoints and caches, deoptimizing
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3194
//      dependent compiled code)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3195
//    - replacing parts in the_class with parts from scratch_class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3196
//    - adding a weak reference to track the obsolete but interesting
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3197
//      parts of the_class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3198
//    - adjusting constant pool caches and vtables in other classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3199
//      that refer to methods in the_class. These adjustments use the
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3200
//      ClassLoaderDataGraph::classes_do() facility which only allows
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3201
//      a helper method to be specified. The interesting parameters
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3202
//      that we would like to pass to the helper method are saved in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3203
//      static global fields in the VM operation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3204
void VM_RedefineClasses::redefine_single_class(jclass the_jclass,
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3205
       Klass* scratch_class_oop, TRAPS) {
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3206
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3207
  HandleMark hm(THREAD);   // make sure handles from this call are freed
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3208
  RC_TIMER_START(_timer_rsc_phase1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3209
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3210
  instanceKlassHandle scratch_class(scratch_class_oop);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3211
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3212
  oop the_class_mirror = JNIHandles::resolve_non_null(the_jclass);
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3213
  Klass* the_class_oop = java_lang_Class::as_Klass(the_class_mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3214
  instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3215
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3216
  // Remove all breakpoints in methods of this class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3217
  JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3218
  jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3219
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3220
  // Deoptimize all compiled code that depends on this class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3221
  flush_dependent_code(the_class, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3222
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3223
  _old_methods = the_class->methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3224
  _new_methods = scratch_class->methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3225
  _the_class_oop = the_class_oop;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3226
  compute_added_deleted_matching_methods();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3227
  update_jmethod_ids();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3228
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3229
  // Attach new constant pool to the original klass. The original
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3230
  // klass still refers to the old constant pool (for now).
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3231
  scratch_class->constants()->set_pool_holder(the_class());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3232
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3233
#if 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3234
  // In theory, with constant pool merging in place we should be able
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3235
  // to save space by using the new, merged constant pool in place of
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3236
  // the old constant pool(s). By "pool(s)" I mean the constant pool in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3237
  // the klass version we are replacing now and any constant pool(s) in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3238
  // previous versions of klass. Nice theory, doesn't work in practice.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3239
  // When this code is enabled, even simple programs throw NullPointer
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3240
  // exceptions. I'm guessing that this is caused by some constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3241
  // cache difference between the new, merged constant pool and the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3242
  // constant pool that was just being used by the klass. I'm keeping
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3243
  // this code around to archive the idea, but the code has to remain
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3244
  // disabled for now.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3245
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3246
  // Attach each old method to the new constant pool. This can be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3247
  // done here since we are past the bytecode verification and
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3248
  // constant pool optimization phases.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3249
  for (int i = _old_methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3250
    Method* method = _old_methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3251
    method->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3252
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3253
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3254
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3255
    // walk all previous versions of the klass
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3256
    InstanceKlass *ik = (InstanceKlass *)the_class();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3257
    PreviousVersionWalker pvw(ik);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3258
    instanceKlassHandle ikh;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3259
    do {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3260
      ikh = pvw.next_previous_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3261
      if (!ikh.is_null()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3262
        ik = ikh();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3263
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3264
        // attach previous version of klass to the new constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3265
        ik->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3266
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3267
        // Attach each method in the previous version of klass to the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3268
        // new constant pool
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3269
        Array<Method*>* prev_methods = ik->methods();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3270
        for (int i = prev_methods->length() - 1; i >= 0; i--) {
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3271
          Method* method = prev_methods->at(i);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3272
          method->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3273
        }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3274
      }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3275
    } while (!ikh.is_null());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3276
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3277
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3278
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3279
  // Replace methods and constantpool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3280
  the_class->set_methods(_new_methods);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3281
  scratch_class->set_methods(_old_methods);     // To prevent potential GCing of the old methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3282
                                          // and to be able to undo operation easily.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3283
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3284
  ConstantPool* old_constants = the_class->constants();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3285
  the_class->set_constants(scratch_class->constants());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3286
  scratch_class->set_constants(old_constants);  // See the previous comment.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3287
#if 0
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3288
  // We are swapping the guts of "the new class" with the guts of "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3289
  // class". Since the old constant pool has just been attached to "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3290
  // new class", it seems logical to set the pool holder in the old
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3291
  // constant pool also. However, doing this will change the observable
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3292
  // class hierarchy for any old methods that are still executing. A
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3293
  // method can query the identity of its "holder" and this query uses
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3294
  // the method's constant pool link to find the holder. The change in
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3295
  // holding class from "the class" to "the new class" can confuse
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3296
  // things.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3297
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3298
  // Setting the old constant pool's holder will also cause
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3299
  // verification done during vtable initialization below to fail.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3300
  // During vtable initialization, the vtable's class is verified to be
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3301
  // a subtype of the method's holder. The vtable's class is "the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3302
  // class" and the method's holder is gotten from the constant pool
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3303
  // link in the method itself. For "the class"'s directly implemented
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3304
  // methods, the method holder is "the class" itself (as gotten from
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3305
  // the new constant pool). The check works fine in this case. The
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3306
  // check also works fine for methods inherited from super classes.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3307
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3308
  // Miranda methods are a little more complicated. A miranda method is
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3309
  // provided by an interface when the class implementing the interface
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3310
  // does not provide its own method.  These interfaces are implemented
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3311
  // internally as an InstanceKlass. These special instanceKlasses
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3312
  // share the constant pool of the class that "implements" the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3313
  // interface. By sharing the constant pool, the method holder of a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3314
  // miranda method is the class that "implements" the interface. In a
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3315
  // non-redefine situation, the subtype check works fine. However, if
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3316
  // the old constant pool's pool holder is modified, then the check
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3317
  // fails because there is no class hierarchy relationship between the
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3318
  // vtable's class and "the new class".
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3319
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3320
  old_constants->set_pool_holder(scratch_class());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3321
#endif
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3322
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3323
  // track which methods are EMCP for add_previous_version() call below
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3324
  BitMap emcp_methods(_old_methods->length());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3325
  int emcp_method_count = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3326
  emcp_methods.clear();  // clears 0..(length() - 1)
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3327
  check_methods_and_mark_as_obsolete(&emcp_methods, &emcp_method_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3328
  transfer_old_native_function_registrations(the_class);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3329
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3330
  // The class file bytes from before any retransformable agents mucked
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3331
  // with them was cached on the scratch class, move to the_class.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3332
  // Note: we still want to do this if nothing needed caching since it
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3333
  // should get cleared in the_class too.
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3334
  if (the_class->get_cached_class_file_bytes() == 0) {
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3335
    // the_class doesn't have a cache yet so copy it
18940
d39d4765e6cb 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 17864
diff changeset
  3336
    the_class->set_cached_class_file(scratch_class->get_cached_class_file());
11399
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3337
  }
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3338
#ifndef PRODUCT
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3339
  else {
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3340
    assert(the_class->get_cached_class_file_bytes() ==
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3341
      scratch_class->get_cached_class_file_bytes(), "cache ptrs must match");
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3342
    assert(the_class->get_cached_class_file_len() ==
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3343
      scratch_class->get_cached_class_file_len(), "cache lens must match");
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3344
  }
5dd5c4dd4b7d 7122253: Instrumentation.retransformClasses() leaks class bytes
dcubed
parents: 10546
diff changeset
  3345
#endif
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3346
17357
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3347
  // NULL out in scratch class to not delete twice.  The class to be redefined
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3348
  // always owns these bytes.
18940
d39d4765e6cb 8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents: 17864
diff changeset
  3349
  scratch_class->set_cached_class_file(NULL);
17357
98206e5df09e 8013063: nsk/jvmti/RetransformClasses/retransform001 failed debug version on os::free
coleenp
parents: 17077
diff changeset
  3350
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3351
  // Replace inner_classes
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3352
  Array<u2>* old_inner_classes = the_class->inner_classes();
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3353
  the_class->set_inner_classes(scratch_class->inner_classes());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3354
  scratch_class->set_inner_classes(old_inner_classes);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3355
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3356
  // Initialize the vtable and interface table after
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3357
  // methods have been rewritten
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3358
  {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3359
    ResourceMark rm(THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3360
    // no exception should happen here since we explicitly
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3361
    // do not check loader constraints.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3362
    // compare_and_normalize_class_versions has already checked:
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3363
    //  - classloaders unchanged, signatures unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3364
    //  - all instanceKlasses for redefined classes reused & contents updated
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3365
    the_class->vtable()->initialize_vtable(false, THREAD);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3366
    the_class->itable()->initialize_itable(false, THREAD);
4571
80b553bddc26 6914300: ciEnv should export all well known classes
never
parents: 3820
diff changeset
  3367
    assert(!HAS_PENDING_EXCEPTION || (THREAD->pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())), "redefine exception");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3368
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3369
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3370
  // Leave arrays of jmethodIDs and itable index cache unchanged
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3371
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3372
  // Copy the "source file name" attribute from new class version
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3373
  the_class->set_source_file_name(scratch_class->source_file_name());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3374
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3375
  // Copy the "source debug extension" attribute from new class version
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3376
  the_class->set_source_debug_extension(
13201
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3377
    scratch_class->source_debug_extension(),
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3378
    scratch_class->source_debug_extension() == NULL ? 0 :
69f157caabcc 6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents: 13195
diff changeset
  3379
    (int)strlen(scratch_class->source_debug_extension()));
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3380
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3381
  // Use of javac -g could be different in the old and the new
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3382
  if (scratch_class->access_flags().has_localvariable_table() !=
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3383
      the_class->access_flags().has_localvariable_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3384
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3385
    AccessFlags flags = the_class->access_flags();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3386
    if (scratch_class->access_flags().has_localvariable_table()) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3387
      flags.set_has_localvariable_table();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3388
    } else {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3389
      flags.clear_has_localvariable_table();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3390
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3391
    the_class->set_access_flags(flags);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3392
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3393
15601
df8faef6efaf 8007320: NPG: move method annotations
coleenp
parents: 15591
diff changeset
  3394
  swap_annotations(the_class, scratch_class);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3395
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3396
  // Replace minor version number of class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3397
  u2 old_minor_version = the_class->minor_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3398
  the_class->set_minor_version(scratch_class->minor_version());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3399
  scratch_class->set_minor_version(old_minor_version);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3400
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3401
  // Replace major version number of class file
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3402
  u2 old_major_version = the_class->major_version();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3403
  the_class->set_major_version(scratch_class->major_version());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3404
  scratch_class->set_major_version(old_major_version);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3405
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3406
  // Replace CP indexes for class and name+type of enclosing method
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3407
  u2 old_class_idx  = the_class->enclosing_method_class_index();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3408
  u2 old_method_idx = the_class->enclosing_method_method_index();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3409
  the_class->set_enclosing_method_indices(
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3410
    scratch_class->enclosing_method_class_index(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3411
    scratch_class->enclosing_method_method_index());
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3412
  scratch_class->set_enclosing_method_indices(old_class_idx, old_method_idx);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3413
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3414
  // keep track of previous versions of this class
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3415
  the_class->add_previous_version(scratch_class, &emcp_methods,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3416
    emcp_method_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3417
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3418
  RC_TIMER_STOP(_timer_rsc_phase1);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3419
  RC_TIMER_START(_timer_rsc_phase2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3420
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3421
  // Adjust constantpool caches and vtables for all classes
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3422
  // that reference methods of the evolved class.
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3423
  AdjustCpoolCacheAndVtable adjust_cpool_cache_and_vtable(THREAD);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3424
  ClassLoaderDataGraph::classes_do(&adjust_cpool_cache_and_vtable);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3425
17029
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3426
  // JSR-292 support
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3427
  MemberNameTable* mnt = the_class->member_names();
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3428
  if (mnt != NULL) {
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3429
    bool trace_name_printed = false;
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3430
    mnt->adjust_method_entries(_matching_old_methods,
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3431
                               _matching_new_methods,
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3432
                               _matching_methods_length,
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3433
                               &trace_name_printed);
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3434
  }
9ff8d7c0ed79 8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents: 15744
diff changeset
  3435
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3436
  // Fix Resolution Error table also to remove old constant pools
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3437
  SystemDictionary::delete_resolution_error(old_constants);
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3438
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3439
  if (the_class->oop_map_cache() != NULL) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3440
    // Flush references to any obsolete methods from the oop map cache
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3441
    // so that obsolete methods are not pinned.
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3442
    the_class->oop_map_cache()->flush_obsolete_entries();
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3443
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3444
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3445
  // increment the classRedefinedCount field in the_class and in any
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3446
  // direct and indirect subclasses of the_class
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3447
  increment_class_counter((InstanceKlass *)the_class(), THREAD);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3448
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3449
  // RC_TRACE macro has an embedded ResourceMark
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3450
  RC_TRACE_WITH_THREAD(0x00000001, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3451
    ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)",
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3452
    the_class->external_name(),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3453
    java_lang_Class::classRedefinedCount(the_class_mirror),
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3454
    os::available_memory() >> 10));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3455
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3456
  RC_TIMER_STOP(_timer_rsc_phase2);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3457
} // end redefine_single_class()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3458
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3459
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3460
// Increment the classRedefinedCount field in the specific InstanceKlass
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3461
// and in all direct and indirect subclasses.
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3462
void VM_RedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) {
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3463
  oop class_mirror = ik->java_mirror();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3464
  Klass* class_oop = java_lang_Class::as_Klass(class_mirror);
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3465
  int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3466
  java_lang_Class::set_classRedefinedCount(class_mirror, new_count);
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3467
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3468
  if (class_oop != _the_class_oop) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3469
    // _the_class_oop count is printed at end of redefine_single_class()
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3470
    RC_TRACE_WITH_THREAD(0x00000008, THREAD,
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3471
      ("updated count in subclass=%s to %d", ik->external_name(), new_count));
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3472
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3473
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3474
  for (Klass *subk = ik->subklass(); subk != NULL;
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3475
       subk = subk->next_sibling()) {
8726
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  3476
    if (subk->oop_is_instance()) {
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  3477
      // Only update instanceKlasses
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3478
      InstanceKlass *subik = (InstanceKlass*)subk;
8726
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  3479
      // recursively do subclasses of the current subclass
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  3480
      increment_class_counter(subik, THREAD);
7bafcf0e5bfb 7029509: nightly failures after static fields in Class
never
parents: 8651
diff changeset
  3481
    }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3482
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3483
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3484
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3485
void VM_RedefineClasses::CheckClass::do_klass(Klass* k) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3486
  bool no_old_methods = true;  // be optimistic
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3487
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3488
  // Both array and instance classes have vtables.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3489
  // a vtable should never contain old or obsolete methods
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3490
  ResourceMark rm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3491
  if (k->vtable_length() > 0 &&
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3492
      !k->vtable()->check_no_old_or_obsolete_entries()) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3493
    if (RC_TRACE_ENABLED(0x00004000)) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3494
      RC_TRACE_WITH_THREAD(0x00004000, _thread,
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3495
        ("klassVtable::check_no_old_or_obsolete_entries failure"
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3496
         " -- OLD or OBSOLETE method found -- class: %s",
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3497
         k->signature_name()));
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3498
      k->vtable()->dump_vtable();
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3499
    }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3500
    no_old_methods = false;
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3501
  }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3502
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3503
  if (k->oop_is_instance()) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3504
    HandleMark hm(_thread);
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3505
    InstanceKlass *ik = InstanceKlass::cast(k);
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3506
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3507
    // an itable should never contain old or obsolete methods
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3508
    if (ik->itable_length() > 0 &&
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3509
        !ik->itable()->check_no_old_or_obsolete_entries()) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3510
      if (RC_TRACE_ENABLED(0x00004000)) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3511
        RC_TRACE_WITH_THREAD(0x00004000, _thread,
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3512
          ("klassItable::check_no_old_or_obsolete_entries failure"
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3513
           " -- OLD or OBSOLETE method found -- class: %s",
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3514
           ik->signature_name()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3515
        ik->itable()->dump_itable();
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3516
      }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3517
      no_old_methods = false;
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3518
    }
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3519
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3520
    // the constant pool cache should never contain old or obsolete methods
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3521
    if (ik->constants() != NULL &&
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3522
        ik->constants()->cache() != NULL &&
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3523
        !ik->constants()->cache()->check_no_old_or_obsolete_entries()) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3524
      if (RC_TRACE_ENABLED(0x00004000)) {
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3525
        RC_TRACE_WITH_THREAD(0x00004000, _thread,
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3526
          ("cp-cache::check_no_old_or_obsolete_entries failure"
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3527
           " -- OLD or OBSOLETE method found -- class: %s",
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3528
           ik->signature_name()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3529
        ik->constants()->cache()->dump_cache();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3530
      }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3531
      no_old_methods = false;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3532
    }
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3533
  }
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3534
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3535
  // print and fail guarantee if old methods are found.
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3536
  if (!no_old_methods) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3537
    if (RC_TRACE_ENABLED(0x00004000)) {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3538
      dump_methods();
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3539
    } else {
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3540
      tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option "
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3541
        "to see more info about the following guarantee() failure.");
13728
882756847a04 6964458: Reimplement class meta-data storage to use native memory
coleenp
parents: 13286
diff changeset
  3542
    }
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3543
    guarantee(false, "OLD and/or OBSOLETE method(s) found");
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3544
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3545
}
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3546
17373
7d8bb2a8787e 8005056: NPG: Crash after redefining java.lang.Object
coleenp
parents: 17357
diff changeset
  3547
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3548
void VM_RedefineClasses::dump_methods() {
15591
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3549
  int j;
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3550
  RC_TRACE(0x00004000, ("_old_methods --"));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3551
  for (j = 0; j < _old_methods->length(); ++j) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3552
    Method* m = _old_methods->at(j);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3553
    RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3554
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3555
    tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3556
    m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3557
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3558
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3559
  RC_TRACE(0x00004000, ("_new_methods --"));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3560
  for (j = 0; j < _new_methods->length(); ++j) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3561
    Method* m = _new_methods->at(j);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3562
    RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3563
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3564
    tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3565
    m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3566
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3567
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3568
  RC_TRACE(0x00004000, ("_matching_(old/new)_methods --"));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3569
  for (j = 0; j < _matching_methods_length; ++j) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3570
    Method* m = _matching_old_methods[j];
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3571
    RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3572
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3573
    tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3574
    m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3575
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3576
    m = _matching_new_methods[j];
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3577
    RC_TRACE_NO_CR(0x00004000, ("      (%5d)  ", m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3578
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3579
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3580
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3581
  RC_TRACE(0x00004000, ("_deleted_methods --"));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3582
  for (j = 0; j < _deleted_methods_length; ++j) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3583
    Method* m = _deleted_methods[j];
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3584
    RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3585
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3586
    tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3587
    m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3588
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3589
  }
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3590
  RC_TRACE(0x00004000, ("_added_methods --"));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3591
  for (j = 0; j < _added_methods_length; ++j) {
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3592
    Method* m = _added_methods[j];
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3593
    RC_TRACE_NO_CR(0x00004000, ("%4d  (%5d)  ", j, m->vtable_index()));
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3594
    m->access_flags().print_on(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3595
    tty->print(" --  ");
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3596
    m->print_name(tty);
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3597
    tty->cr();
b8aa0577f137 7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents: 15446
diff changeset
  3598
  }
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
  3599
}