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