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