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