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