author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 47103 | hotspot/src/share/vm/oops/cpCache.cpp@a993ec29ec75 |
child 47634 | 6a0c42c40cd1 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
40655
diff
changeset
|
2 |
* Copyright (c) 1998, 2017, 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:
5420
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
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:
5420
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
26 |
#include "interpreter/bytecodeStream.hpp" |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
27 |
#include "interpreter/bytecodes.hpp" |
7397 | 28 |
#include "interpreter/interpreter.hpp" |
29 |
#include "interpreter/rewriter.hpp" |
|
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
30 |
#include "logging/log.hpp" |
47095
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
31 |
#include "memory/metadataFactory.hpp" |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
32 |
#include "memory/metaspaceClosure.hpp" |
37248 | 33 |
#include "memory/resourceArea.hpp" |
7397 | 34 |
#include "memory/universe.inline.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
35 |
#include "oops/cpCache.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28019
diff
changeset
|
36 |
#include "oops/objArrayOop.inline.hpp" |
7397 | 37 |
#include "oops/oop.inline.hpp" |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
38 |
#include "prims/methodHandles.hpp" |
40655
9f644073d3a0
8157907: Incorrect inclusion of atomic.hpp instead of atomic.inline.hpp
dholmes
parents:
38259
diff
changeset
|
39 |
#include "runtime/atomic.hpp" |
7397 | 40 |
#include "runtime/handles.inline.hpp" |
24351
61b33cc6d3cf
8042195: Introduce umbrella header orderAccess.inline.hpp.
goetz
parents:
23515
diff
changeset
|
41 |
#include "runtime/orderAccess.inline.hpp" |
15482
470d0b0c09f1
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
14490
diff
changeset
|
42 |
#include "utilities/macros.hpp" |
1 | 43 |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
24351
diff
changeset
|
44 |
// Implementation of ConstantPoolCacheEntry |
1 | 45 |
|
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
3261
diff
changeset
|
46 |
void ConstantPoolCacheEntry::initialize_entry(int index) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
670
diff
changeset
|
47 |
assert(0 < index && index < 0x10000, "sanity check"); |
1 | 48 |
_indices = index; |
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
49 |
_f1 = NULL; |
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
50 |
_f2 = _flags = 0; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
670
diff
changeset
|
51 |
assert(constant_pool_index() == index, ""); |
1 | 52 |
} |
53 |
||
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
54 |
void ConstantPoolCacheEntry::verify_just_initialized(bool f2_used) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
55 |
assert((_indices & (~cp_index_mask)) == 0, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
56 |
assert(_f1 == NULL, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
57 |
assert(_flags == 0, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
58 |
if (!f2_used) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
59 |
assert(_f2 == 0, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
60 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
61 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
62 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
63 |
void ConstantPoolCacheEntry::reinitialize(bool f2_used) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
64 |
_indices &= cp_index_mask; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
65 |
_f1 = NULL; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
66 |
_flags = 0; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
67 |
if (!f2_used) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
68 |
_f2 = 0; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
69 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
70 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
71 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
72 |
int ConstantPoolCacheEntry::make_flags(TosState state, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
73 |
int option_bits, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
74 |
int field_index_or_method_params) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
75 |
assert(state < number_of_states, "Invalid state in make_flags"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
76 |
int f = ((int)state << tos_state_shift) | option_bits | field_index_or_method_params; |
1 | 77 |
// Preserve existing flag bit values |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
78 |
// The low bits are a field offset, or else the method parameter size. |
1 | 79 |
#ifdef ASSERT |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
80 |
TosState old_state = flag_state(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
81 |
assert(old_state == (TosState)0 || old_state == state, |
1 | 82 |
"inconsistent cpCache flags state"); |
83 |
#endif |
|
84 |
return (_flags | f) ; |
|
85 |
} |
|
86 |
||
87 |
void ConstantPoolCacheEntry::set_bytecode_1(Bytecodes::Code code) { |
|
88 |
#ifdef ASSERT |
|
89 |
// Read once. |
|
90 |
volatile Bytecodes::Code c = bytecode_1(); |
|
91 |
assert(c == 0 || c == code || code == 0, "update must be consistent"); |
|
92 |
#endif |
|
93 |
// Need to flush pending stores here before bytecode is written. |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
94 |
OrderAccess::release_store_ptr(&_indices, _indices | ((u_char)code << bytecode_1_shift)); |
1 | 95 |
} |
96 |
||
97 |
void ConstantPoolCacheEntry::set_bytecode_2(Bytecodes::Code code) { |
|
98 |
#ifdef ASSERT |
|
99 |
// Read once. |
|
100 |
volatile Bytecodes::Code c = bytecode_2(); |
|
101 |
assert(c == 0 || c == code || code == 0, "update must be consistent"); |
|
102 |
#endif |
|
103 |
// Need to flush pending stores here before bytecode is written. |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
104 |
OrderAccess::release_store_ptr(&_indices, _indices | ((u_char)code << bytecode_2_shift)); |
1 | 105 |
} |
106 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
107 |
// Sets f1, ordering with previous writes. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
108 |
void ConstantPoolCacheEntry::release_set_f1(Metadata* f1) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
109 |
assert(f1 != NULL, ""); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
110 |
OrderAccess::release_store_ptr((HeapWord*) &_f1, f1); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
111 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
112 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
113 |
// Sets flags, but only if the value was previously zero. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
114 |
bool ConstantPoolCacheEntry::init_flags_atomic(intptr_t flags) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
115 |
intptr_t result = Atomic::cmpxchg_ptr(flags, &_flags, 0); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
116 |
return (result == 0); |
8316
0816329cc3ee
7012339: JSR 292 crash in G1SATBCardTableModRefBS::write_ref_field_pre_work()
twisti
parents:
7397
diff
changeset
|
117 |
} |
7104 | 118 |
|
1 | 119 |
// Note that concurrent update of both bytecodes can leave one of them |
120 |
// reset to zero. This is harmless; the interpreter will simply re-resolve |
|
121 |
// the damaged entry. More seriously, the memory synchronization is needed |
|
122 |
// to flush other fields (f1, f2) completely to memory before the bytecodes |
|
123 |
// are updated, lest other processors see a non-zero bytecode but zero f1/f2. |
|
124 |
void ConstantPoolCacheEntry::set_field(Bytecodes::Code get_code, |
|
125 |
Bytecodes::Code put_code, |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46271
diff
changeset
|
126 |
Klass* field_holder, |
10546 | 127 |
int field_index, |
1 | 128 |
int field_offset, |
129 |
TosState field_type, |
|
130 |
bool is_final, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
131 |
bool is_volatile, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
132 |
Klass* root_klass) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46271
diff
changeset
|
133 |
set_f1(field_holder); |
1 | 134 |
set_f2(field_offset); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
135 |
assert((field_index & field_index_mask) == field_index, |
1 | 136 |
"field index does not fit in low flag bits"); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
137 |
set_field_flags(field_type, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
138 |
((is_volatile ? 1 : 0) << is_volatile_shift) | |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
139 |
((is_final ? 1 : 0) << is_final_shift), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
140 |
field_index); |
1 | 141 |
set_bytecode_1(get_code); |
142 |
set_bytecode_2(put_code); |
|
143 |
NOT_PRODUCT(verify(tty)); |
|
144 |
} |
|
145 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
146 |
void ConstantPoolCacheEntry::set_parameter_size(int value) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
147 |
// This routine is called only in corner cases where the CPCE is not yet initialized. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
148 |
// See AbstractInterpreter::deopt_continue_after_entry. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
149 |
assert(_flags == 0 || parameter_size() == 0 || parameter_size() == value, |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
150 |
"size must not change: parameter_size=%d, value=%d", parameter_size(), value); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
151 |
// Setting the parameter size by itself is only safe if the |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
152 |
// current value of _flags is 0, otherwise another thread may have |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
153 |
// updated it and we don't want to overwrite that value. Don't |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
154 |
// bother trying to update it once it's nonzero but always make |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
155 |
// sure that the final parameter size agrees with what was passed. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
156 |
if (_flags == 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
157 |
Atomic::cmpxchg_ptr((value & parameter_size_mask), &_flags, 0); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
158 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
159 |
guarantee(parameter_size() == value, |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
160 |
"size must not change: parameter_size=%d, value=%d", parameter_size(), value); |
1 | 161 |
} |
162 |
||
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
163 |
void ConstantPoolCacheEntry::set_direct_or_vtable_call(Bytecodes::Code invoke_code, |
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
164 |
const methodHandle& method, |
44738 | 165 |
int vtable_index, |
166 |
bool sender_is_interface) { |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
167 |
bool is_vtable_call = (vtable_index >= 0); // FIXME: split this method on this boolean |
1 | 168 |
assert(method->interpreter_entry() != NULL, "should have been set at this point"); |
169 |
assert(!method->is_obsolete(), "attempt to write obsolete method to cpCache"); |
|
170 |
||
171 |
int byte_no = -1; |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
172 |
bool change_to_virtual = false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
173 |
|
1 | 174 |
switch (invoke_code) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
175 |
case Bytecodes::_invokeinterface: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
176 |
// We get here from InterpreterRuntime::resolve_invoke when an invokeinterface |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
177 |
// instruction somehow links to a non-interface method (in Object). |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
178 |
// In that case, the method has no itable index and must be invoked as a virtual. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
179 |
// Set a flag to keep track of this corner case. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
180 |
change_to_virtual = true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
181 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
182 |
// ...and fall through as if we were handling invokevirtual: |
1 | 183 |
case Bytecodes::_invokevirtual: |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
184 |
{ |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
185 |
if (!is_vtable_call) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
186 |
assert(method->can_be_statically_bound(), ""); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
187 |
// set_f2_as_vfinal_method checks if is_vfinal flag is true. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
188 |
set_method_flags(as_TosState(method->result_type()), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
189 |
( 1 << is_vfinal_shift) | |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
190 |
((method->is_final_method() ? 1 : 0) << is_final_shift) | |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
191 |
((change_to_virtual ? 1 : 0) << is_forced_virtual_shift), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
192 |
method()->size_of_parameters()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
193 |
set_f2_as_vfinal_method(method()); |
1 | 194 |
} else { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
195 |
assert(!method->can_be_statically_bound(), ""); |
1 | 196 |
assert(vtable_index >= 0, "valid index"); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
197 |
assert(!method->is_final_method(), "sanity"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
198 |
set_method_flags(as_TosState(method->result_type()), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
199 |
((change_to_virtual ? 1 : 0) << is_forced_virtual_shift), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
200 |
method()->size_of_parameters()); |
1 | 201 |
set_f2(vtable_index); |
202 |
} |
|
203 |
byte_no = 2; |
|
204 |
break; |
|
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
205 |
} |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
206 |
|
1 | 207 |
case Bytecodes::_invokespecial: |
208 |
case Bytecodes::_invokestatic: |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
209 |
assert(!is_vtable_call, ""); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
210 |
// Note: Read and preserve the value of the is_vfinal flag on any |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
211 |
// invokevirtual bytecode shared with this constant pool cache entry. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
212 |
// It is cheap and safe to consult is_vfinal() at all times. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
213 |
// Once is_vfinal is set, it must stay that way, lest we get a dangling oop. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
214 |
set_method_flags(as_TosState(method->result_type()), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
215 |
((is_vfinal() ? 1 : 0) << is_vfinal_shift) | |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
216 |
((method->is_final_method() ? 1 : 0) << is_final_shift), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
217 |
method()->size_of_parameters()); |
1 | 218 |
set_f1(method()); |
219 |
byte_no = 1; |
|
220 |
break; |
|
221 |
default: |
|
222 |
ShouldNotReachHere(); |
|
223 |
break; |
|
224 |
} |
|
225 |
||
226 |
// Note: byte_no also appears in TemplateTable::resolve. |
|
227 |
if (byte_no == 1) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
228 |
assert(invoke_code != Bytecodes::_invokevirtual && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
229 |
invoke_code != Bytecodes::_invokeinterface, ""); |
44738 | 230 |
// Don't mark invokespecial to method as resolved if sender is an interface. The receiver |
231 |
// has to be checked that it is a subclass of the current class every time this bytecode |
|
232 |
// is executed. |
|
233 |
if (invoke_code != Bytecodes::_invokespecial || !sender_is_interface || |
|
234 |
method->name() == vmSymbols::object_initializer_name()) { |
|
1 | 235 |
set_bytecode_1(invoke_code); |
44738 | 236 |
} |
1 | 237 |
} else if (byte_no == 2) { |
238 |
if (change_to_virtual) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
239 |
assert(invoke_code == Bytecodes::_invokeinterface, ""); |
1 | 240 |
// NOTE: THIS IS A HACK - BE VERY CAREFUL!!! |
241 |
// |
|
242 |
// Workaround for the case where we encounter an invokeinterface, but we |
|
243 |
// should really have an _invokevirtual since the resolved method is a |
|
244 |
// virtual method in java.lang.Object. This is a corner case in the spec |
|
245 |
// but is presumably legal. javac does not generate this code. |
|
246 |
// |
|
247 |
// We set bytecode_1() to _invokeinterface, because that is the |
|
248 |
// bytecode # used by the interpreter to see if it is resolved. |
|
249 |
// We set bytecode_2() to _invokevirtual. |
|
250 |
// See also interpreterRuntime.cpp. (8/25/2000) |
|
251 |
// Only set resolved for the invokeinterface case if method is public. |
|
252 |
// Otherwise, the method needs to be reresolved with caller for each |
|
253 |
// interface call. |
|
254 |
if (method->is_public()) set_bytecode_1(invoke_code); |
|
255 |
} else { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
256 |
assert(invoke_code == Bytecodes::_invokevirtual, ""); |
1 | 257 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
258 |
// set up for invokevirtual, even if linking for invokeinterface also: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
259 |
set_bytecode_2(Bytecodes::_invokevirtual); |
1 | 260 |
} else { |
261 |
ShouldNotReachHere(); |
|
262 |
} |
|
263 |
NOT_PRODUCT(verify(tty)); |
|
264 |
} |
|
265 |
||
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
266 |
void ConstantPoolCacheEntry::set_direct_call(Bytecodes::Code invoke_code, const methodHandle& method, |
44738 | 267 |
bool sender_is_interface) { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
268 |
int index = Method::nonvirtual_vtable_index; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
269 |
// index < 0; FIXME: inline and customize set_direct_or_vtable_call |
44738 | 270 |
set_direct_or_vtable_call(invoke_code, method, index, sender_is_interface); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
271 |
} |
1 | 272 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
273 |
void ConstantPoolCacheEntry::set_vtable_call(Bytecodes::Code invoke_code, const methodHandle& method, int index) { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
274 |
// either the method is a miranda or its holder should accept the given index |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
275 |
assert(method->method_holder()->is_interface() || method->method_holder()->verify_vtable_index(index), ""); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
276 |
// index >= 0; FIXME: inline and customize set_direct_or_vtable_call |
44738 | 277 |
set_direct_or_vtable_call(invoke_code, method, index, false); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
278 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
279 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
280 |
void ConstantPoolCacheEntry::set_itable_call(Bytecodes::Code invoke_code, const methodHandle& method, int index) { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
281 |
assert(method->method_holder()->verify_itable_index(index), ""); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
17858
diff
changeset
|
282 |
assert(invoke_code == Bytecodes::_invokeinterface, ""); |
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
13929
diff
changeset
|
283 |
InstanceKlass* interf = method->method_holder(); |
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
13929
diff
changeset
|
284 |
assert(interf->is_interface(), "must be an interface"); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
285 |
assert(!method->is_final_method(), "interfaces do not have final methods; cannot link to one here"); |
1 | 286 |
set_f1(interf); |
287 |
set_f2(index); |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
288 |
set_method_flags(as_TosState(method->result_type()), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
289 |
0, // no option bits |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
290 |
method()->size_of_parameters()); |
1 | 291 |
set_bytecode_1(Bytecodes::_invokeinterface); |
292 |
} |
|
293 |
||
294 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
295 |
void ConstantPoolCacheEntry::set_method_handle(const constantPoolHandle& cpool, const CallInfo &call_info) { |
14393
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
296 |
set_method_handle_common(cpool, Bytecodes::_invokehandle, call_info); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
297 |
} |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
298 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
299 |
void ConstantPoolCacheEntry::set_dynamic_call(const constantPoolHandle& cpool, const CallInfo &call_info) { |
14393
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
300 |
set_method_handle_common(cpool, Bytecodes::_invokedynamic, call_info); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
301 |
} |
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5547
diff
changeset
|
302 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
303 |
void ConstantPoolCacheEntry::set_method_handle_common(const constantPoolHandle& cpool, |
13740
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
304 |
Bytecodes::Code invoke_code, |
14393
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
305 |
const CallInfo &call_info) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
306 |
// NOTE: This CPCE can be the subject of data races. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
307 |
// There are three words to update: flags, refs[f2], f1 (in that order). |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
308 |
// Writers must store all other values before f1. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
309 |
// Readers must test f1 first for non-null before reading other fields. |
13740
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
310 |
// Competing writers must acquire exclusive access via a lock. |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
311 |
// A losing writer waits on the lock until the winner writes f1 and leaves |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
312 |
// the lock, so that when the losing writer returns, he can use the linked |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
313 |
// cache entry. |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
314 |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
40655
diff
changeset
|
315 |
objArrayHandle resolved_references(Thread::current(), cpool->resolved_references()); |
28019
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
316 |
// Use the resolved_references() lock for this cpCache entry. |
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
317 |
// resolved_references are created for all classes with Invokedynamic, MethodHandle |
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
318 |
// or MethodType constant pool cache entries. |
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
319 |
assert(resolved_references() != NULL, |
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
320 |
"a resolved_references array should have been created for this class"); |
a6303ff71902
8066171: Out of order with Metaspace allocation lock
coleenp
parents:
25354
diff
changeset
|
321 |
ObjectLocker ol(resolved_references, Thread::current()); |
13740
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
322 |
if (!is_f1_null()) { |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
323 |
return; |
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
324 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
325 |
|
14393
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
326 |
const methodHandle adapter = call_info.resolved_method(); |
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
327 |
const Handle appendix = call_info.resolved_appendix(); |
93a4dcdbebfd
8001658: No need to pass resolved_references as argument to ConstantPoolCacheEntry::set_method_handle_common
twisti
parents:
13929
diff
changeset
|
328 |
const Handle method_type = call_info.resolved_method_type(); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
329 |
const bool has_appendix = appendix.not_null(); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
330 |
const bool has_method_type = method_type.not_null(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
331 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
332 |
// Write the flags. |
13740
ae6179641137
7196242: vm/mlvm/indy/stress/java/loopsAndThreads crashed
twisti
parents:
13728
diff
changeset
|
333 |
set_method_flags(as_TosState(adapter->result_type()), |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
334 |
((has_appendix ? 1 : 0) << has_appendix_shift ) | |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
335 |
((has_method_type ? 1 : 0) << has_method_type_shift) | |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
336 |
( 1 << is_final_shift ), |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
337 |
adapter->size_of_parameters()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
338 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
339 |
if (TraceInvokeDynamic) { |
35543
0961315f4016
8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic
vlivanov
parents:
33611
diff
changeset
|
340 |
ttyLocker ttyl; |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30289
diff
changeset
|
341 |
tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
342 |
invoke_code, |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
343 |
p2i(appendix()), (has_appendix ? "" : " (unused)"), |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
344 |
p2i(method_type()), (has_method_type ? "" : " (unused)"), |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
33105
diff
changeset
|
345 |
p2i(adapter())); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
346 |
adapter->print(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
347 |
if (has_appendix) appendix()->print(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
348 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
349 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
350 |
// Method handle invokes and invokedynamic sites use both cp cache words. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
351 |
// refs[f2], if not null, contains a value passed as a trailing argument to the adapter. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
352 |
// In the general case, this could be the call site's MethodType, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
353 |
// for use with java.lang.Invokers.checkExactType, or else a CallSite object. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
354 |
// f1 contains the adapter method which manages the actual call. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
355 |
// In the general case, this is a compiled LambdaForm. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
356 |
// (The Java code is free to optimize these calls by binding other |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
357 |
// sorts of methods and appendices to call sites.) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
358 |
// JVM-level linking is via f1, as if for invokespecial, and signatures are erased. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
359 |
// The appendix argument (if any) is added to the signature, and is counted in the parameter_size bits. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
360 |
// Even with the appendix, the method will never take more than 255 parameter slots. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
361 |
// |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
362 |
// This means that given a call site like (List)mh.invoke("foo"), |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
363 |
// the f1 method has signature '(Ljl/Object;Ljl/invoke/MethodType;)Ljl/Object;', |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
364 |
// not '(Ljava/lang/String;)Ljava/util/List;'. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
365 |
// The fact that String and List are involved is encoded in the MethodType in refs[f2]. |
23515
f4872ef5df09
8031820: NPG: Fix remaining references to metadata as oops in comments
coleenp
parents:
22859
diff
changeset
|
366 |
// This allows us to create fewer Methods, while keeping type safety. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
367 |
// |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
368 |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
369 |
// Store appendix, if any. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
370 |
if (has_appendix) { |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
371 |
const int appendix_index = f2_as_index() + _indy_resolved_references_appendix_offset; |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
372 |
assert(appendix_index >= 0 && appendix_index < resolved_references->length(), "oob"); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
373 |
assert(resolved_references->obj_at(appendix_index) == NULL, "init just once"); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
374 |
resolved_references->obj_at_put(appendix_index, appendix()); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
375 |
} |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
376 |
|
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
377 |
// Store MethodType, if any. |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
378 |
if (has_method_type) { |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
379 |
const int method_type_index = f2_as_index() + _indy_resolved_references_method_type_offset; |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
380 |
assert(method_type_index >= 0 && method_type_index < resolved_references->length(), "oob"); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
381 |
assert(resolved_references->obj_at(method_type_index) == NULL, "init just once"); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
382 |
resolved_references->obj_at_put(method_type_index, method_type()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
383 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
384 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
385 |
release_set_f1(adapter()); // This must be the last one to set (see NOTE above)! |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
386 |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
387 |
// The interpreter assembly code does not check byte_2, |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
388 |
// but it is used by is_resolved, method_if_resolved, etc. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
389 |
set_bytecode_1(invoke_code); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
390 |
NOT_PRODUCT(verify(tty)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
391 |
if (TraceInvokeDynamic) { |
35543
0961315f4016
8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic
vlivanov
parents:
33611
diff
changeset
|
392 |
ttyLocker ttyl; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
393 |
this->print(tty, 0); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
394 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
670
diff
changeset
|
395 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
670
diff
changeset
|
396 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
397 |
Method* ConstantPoolCacheEntry::method_if_resolved(const constantPoolHandle& cpool) { |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
398 |
// Decode the action of set_method and set_interface_call |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
399 |
Bytecodes::Code invoke_code = bytecode_1(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
400 |
if (invoke_code != (Bytecodes::Code)0) { |
22859
7b88983393b7
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
21557
diff
changeset
|
401 |
Metadata* f1 = f1_ord(); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
402 |
if (f1 != NULL) { |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
403 |
switch (invoke_code) { |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
404 |
case Bytecodes::_invokeinterface: |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
405 |
assert(f1->is_klass(), ""); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
406 |
return klassItable::method_for_itable_index((Klass*)f1, f2_as_index()); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
407 |
case Bytecodes::_invokestatic: |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
408 |
case Bytecodes::_invokespecial: |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
409 |
assert(!has_appendix(), ""); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
410 |
case Bytecodes::_invokehandle: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
411 |
case Bytecodes::_invokedynamic: |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
412 |
assert(f1->is_method(), ""); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
413 |
return (Method*)f1; |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46458
diff
changeset
|
414 |
default: |
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46458
diff
changeset
|
415 |
break; |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
416 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
417 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
418 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
419 |
invoke_code = bytecode_2(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
420 |
if (invoke_code != (Bytecodes::Code)0) { |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
421 |
switch (invoke_code) { |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
422 |
case Bytecodes::_invokevirtual: |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
423 |
if (is_vfinal()) { |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
424 |
// invokevirtual |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
425 |
Method* m = f2_as_vfinal_method(); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
426 |
assert(m->is_method(), ""); |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
427 |
return m; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
428 |
} else { |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
429 |
int holder_index = cpool->uncached_klass_ref_index_at(constant_pool_index()); |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
430 |
if (cpool->tag_at(holder_index).is_klass()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
431 |
Klass* klass = cpool->resolved_klass_at(holder_index); |
35900 | 432 |
return klass->method_at_vtable(f2_as_index()); |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
433 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
434 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
435 |
break; |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46458
diff
changeset
|
436 |
default: |
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46458
diff
changeset
|
437 |
break; |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
438 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
439 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
440 |
return NULL; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
441 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
442 |
|
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9328
diff
changeset
|
443 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
444 |
oop ConstantPoolCacheEntry::appendix_if_resolved(const constantPoolHandle& cpool) { |
24926
5ea835dfafaa
8029381: assert(is_method_type()) failed: bad cast
drchase
parents:
24459
diff
changeset
|
445 |
if (!has_appendix()) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
446 |
return NULL; |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
447 |
const int ref_index = f2_as_index() + _indy_resolved_references_appendix_offset; |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
448 |
objArrayOop resolved_references = cpool->resolved_references(); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
449 |
return resolved_references->obj_at(ref_index); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
450 |
} |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
451 |
|
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
452 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
453 |
oop ConstantPoolCacheEntry::method_type_if_resolved(const constantPoolHandle& cpool) { |
24926
5ea835dfafaa
8029381: assert(is_method_type()) failed: bad cast
drchase
parents:
24459
diff
changeset
|
454 |
if (!has_method_type()) |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
455 |
return NULL; |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
456 |
const int ref_index = f2_as_index() + _indy_resolved_references_method_type_offset; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
457 |
objArrayOop resolved_references = cpool->resolved_references(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
458 |
return resolved_references->obj_at(ref_index); |
1 | 459 |
} |
460 |
||
461 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
462 |
#if INCLUDE_JVMTI |
1 | 463 |
// RedefineClasses() API support: |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
464 |
// If this ConstantPoolCacheEntry refers to old_method then update it |
1 | 465 |
// to refer to new_method. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
466 |
bool ConstantPoolCacheEntry::adjust_method_entry(Method* old_method, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
467 |
Method* new_method, bool * trace_name_printed) { |
1 | 468 |
|
469 |
if (is_vfinal()) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
470 |
// virtual and final so _f2 contains method ptr instead of vtable index |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
471 |
if (f2_as_vfinal_method() == old_method) { |
1 | 472 |
// match old_method so need an update |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
473 |
// NOTE: can't use set_f2_as_vfinal_method as it asserts on different values |
1 | 474 |
_f2 = (intptr_t)new_method; |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
475 |
if (log_is_enabled(Info, redefine, class, update)) { |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
476 |
ResourceMark rm; |
1 | 477 |
if (!(*trace_name_printed)) { |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
478 |
log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name()); |
1 | 479 |
*trace_name_printed = true; |
480 |
} |
|
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
481 |
log_debug(redefine, class, update, constantpool) |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
482 |
("cpc vf-entry update: %s(%s)", new_method->name()->as_C_string(), new_method->signature()->as_C_string()); |
1 | 483 |
} |
484 |
return true; |
|
485 |
} |
|
486 |
||
487 |
// f1() is not used with virtual entries so bail out |
|
488 |
return false; |
|
489 |
} |
|
490 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
491 |
if (_f1 == NULL) { |
1 | 492 |
// NULL f1() means this is a virtual entry so bail out |
493 |
// We are assuming that the vtable index does not need change. |
|
494 |
return false; |
|
495 |
} |
|
496 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
497 |
if (_f1 == old_method) { |
1 | 498 |
_f1 = new_method; |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
499 |
if (log_is_enabled(Info, redefine, class, update)) { |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
500 |
ResourceMark rm; |
1 | 501 |
if (!(*trace_name_printed)) { |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
502 |
log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name()); |
1 | 503 |
*trace_name_printed = true; |
504 |
} |
|
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
505 |
log_debug(redefine, class, update, constantpool) |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38033
diff
changeset
|
506 |
("cpc entry update: %s(%s)", new_method->name()->as_C_string(), new_method->signature()->as_C_string()); |
1 | 507 |
} |
508 |
return true; |
|
509 |
} |
|
510 |
||
511 |
return false; |
|
512 |
} |
|
513 |
||
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
514 |
// a constant pool cache entry should never contain old or obsolete methods |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
515 |
bool ConstantPoolCacheEntry::check_no_old_or_obsolete_entries() { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
516 |
if (is_vfinal()) { |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
517 |
// virtual and final so _f2 contains method ptr instead of vtable index |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
518 |
Metadata* f2 = (Metadata*)_f2; |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
519 |
// Return false if _f2 refers to an old or an obsolete method. |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
520 |
// _f2 == NULL || !_f2->is_method() are just as unexpected here. |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
521 |
return (f2 != NULL NOT_PRODUCT(&& f2->is_valid()) && f2->is_method() && |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
522 |
!((Method*)f2)->is_old() && !((Method*)f2)->is_obsolete()); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
523 |
} else if (_f1 == NULL || |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
524 |
(NOT_PRODUCT(_f1->is_valid() &&) !_f1->is_method())) { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
525 |
// _f1 == NULL || !_f1->is_method() are OK here |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
526 |
return true; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
527 |
} |
24459
ebd373039673
8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents:
24424
diff
changeset
|
528 |
// return false if _f1 refers to a non-deleted old or obsolete method |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
529 |
return (NOT_PRODUCT(_f1->is_valid() &&) _f1->is_method() && |
24459
ebd373039673
8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents:
24424
diff
changeset
|
530 |
(f1_as_method()->is_deleted() || |
ebd373039673
8042796: jvmtiRedefineClasses.cpp: guarantee(false) failed: OLD and/or OBSOLETE method(s) found
sspitsyn
parents:
24424
diff
changeset
|
531 |
(!f1_as_method()->is_old() && !f1_as_method()->is_obsolete()))); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
532 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
533 |
|
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
534 |
Method* ConstantPoolCacheEntry::get_interesting_method_entry(Klass* k) { |
1 | 535 |
if (!is_method_entry()) { |
536 |
// not a method entry so not interesting by default |
|
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
537 |
return NULL; |
1 | 538 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
539 |
Method* m = NULL; |
1 | 540 |
if (is_vfinal()) { |
541 |
// virtual and final so _f2 contains method ptr instead of vtable index |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
542 |
m = f2_as_vfinal_method(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
543 |
} else if (is_f1_null()) { |
1 | 544 |
// NULL _f1 means this is a virtual entry so also not interesting |
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
545 |
return NULL; |
1 | 546 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
547 |
if (!(_f1->is_method())) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
548 |
// _f1 can also contain a Klass* for an interface |
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
549 |
return NULL; |
1 | 550 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
11956
diff
changeset
|
551 |
m = f1_as_method(); |
1 | 552 |
} |
553 |
assert(m != NULL && m->is_method(), "sanity check"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
554 |
if (m == NULL || !m->is_method() || (k != NULL && m->method_holder() != k)) { |
1 | 555 |
// robustness for above sanity checks or method is not in |
556 |
// the interesting class |
|
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
557 |
return NULL; |
1 | 558 |
} |
559 |
// the method is in the interesting class so the entry is interesting |
|
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
560 |
return m; |
1 | 561 |
} |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
562 |
#endif // INCLUDE_JVMTI |
1 | 563 |
|
564 |
void ConstantPoolCacheEntry::print(outputStream* st, int index) const { |
|
565 |
// print separator |
|
11956
c363dc1ac4b7
7148126: ConstantPoolCacheEntry::print prints to wrong stream
dholmes
parents:
10546
diff
changeset
|
566 |
if (index == 0) st->print_cr(" -------------"); |
1 | 567 |
// print entry |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30289
diff
changeset
|
568 |
st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this); |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
569 |
st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
570 |
constant_pool_index()); |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30289
diff
changeset
|
571 |
st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1); |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30289
diff
changeset
|
572 |
st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2); |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
30289
diff
changeset
|
573 |
st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); |
11956
c363dc1ac4b7
7148126: ConstantPoolCacheEntry::print prints to wrong stream
dholmes
parents:
10546
diff
changeset
|
574 |
st->print_cr(" -------------"); |
1 | 575 |
} |
576 |
||
577 |
void ConstantPoolCacheEntry::verify(outputStream* st) const { |
|
578 |
// not implemented yet |
|
579 |
} |
|
580 |
||
581 |
// Implementation of ConstantPoolCache |
|
582 |
||
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
583 |
ConstantPoolCache* ConstantPoolCache::allocate(ClassLoaderData* loader_data, |
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
584 |
const intStack& index_map, |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
585 |
const intStack& invokedynamic_index_map, |
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
586 |
const intStack& invokedynamic_map, TRAPS) { |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
587 |
|
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
588 |
const int length = index_map.length() + invokedynamic_index_map.length(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
589 |
int size = ConstantPoolCache::size(length); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
590 |
|
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
591 |
return new (loader_data, size, MetaspaceObj::ConstantPoolCacheType, THREAD) |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
592 |
ConstantPoolCache(length, index_map, invokedynamic_index_map, invokedynamic_map); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
593 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
594 |
|
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
595 |
void ConstantPoolCache::initialize(const intArray& inverse_index_map, |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
596 |
const intArray& invokedynamic_inverse_index_map, |
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15595
diff
changeset
|
597 |
const intArray& invokedynamic_references_map) { |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
598 |
for (int i = 0; i < inverse_index_map.length(); i++) { |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
3261
diff
changeset
|
599 |
ConstantPoolCacheEntry* e = entry_at(i); |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
35913
diff
changeset
|
600 |
int original_index = inverse_index_map.at(i); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
601 |
e->initialize_entry(original_index); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
602 |
assert(entry_at(i) == e, "sanity"); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
603 |
} |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
604 |
|
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
605 |
// Append invokedynamic entries at the end |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
606 |
int invokedynamic_offset = inverse_index_map.length(); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
607 |
for (int i = 0; i < invokedynamic_inverse_index_map.length(); i++) { |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
608 |
int offset = i + invokedynamic_offset; |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
609 |
ConstantPoolCacheEntry* e = entry_at(offset); |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
35913
diff
changeset
|
610 |
int original_index = invokedynamic_inverse_index_map.at(i); |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
611 |
e->initialize_entry(original_index); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
612 |
assert(entry_at(offset) == e, "sanity"); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
613 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
21079
diff
changeset
|
614 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
615 |
for (int ref = 0; ref < invokedynamic_references_map.length(); ref++) { |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
35913
diff
changeset
|
616 |
const int cpci = invokedynamic_references_map.at(ref); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
617 |
if (cpci >= 0) { |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
618 |
#ifdef ASSERT |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
619 |
// invokedynamic and invokehandle have more entries; check if they |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
620 |
// all point to the same constant pool cache entry. |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
621 |
for (int entry = 1; entry < ConstantPoolCacheEntry::_indy_resolved_references_entries; entry++) { |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
35913
diff
changeset
|
622 |
const int cpci_next = invokedynamic_references_map.at(ref + entry); |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31592
diff
changeset
|
623 |
assert(cpci == cpci_next, "%d == %d", cpci, cpci_next); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
624 |
} |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
625 |
#endif |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
626 |
entry_at(cpci)->initialize_resolved_reference_index(ref); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
627 |
ref += ConstantPoolCacheEntry::_indy_resolved_references_entries - 1; // skip extra entries |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13740
diff
changeset
|
628 |
} |
4429
d7eb4e2099aa
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
3261
diff
changeset
|
629 |
} |
1 | 630 |
} |
631 |
||
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
632 |
void ConstantPoolCache::verify_just_initialized() { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
633 |
DEBUG_ONLY(walk_entries_for_initialization(/*check_only = */ true)); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
634 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
635 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
636 |
void ConstantPoolCache::remove_unshareable_info() { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
637 |
walk_entries_for_initialization(/*check_only = */ false); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
638 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
639 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
640 |
void ConstantPoolCache::walk_entries_for_initialization(bool check_only) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
641 |
assert(DumpSharedSpaces, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
642 |
// When dumping the archive, we want to clean up the ConstantPoolCache |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
643 |
// to remove any effect of linking due to the execution of Java code -- |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
644 |
// each ConstantPoolCacheEntry will have the same contents as if |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
645 |
// ConstantPoolCache::initialize has just returned: |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
646 |
// |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
647 |
// - We keep the ConstantPoolCache::constant_pool_index() bits for all entries. |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
648 |
// - We keep the "f2" field for entries used by invokedynamic and invokehandle |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
649 |
// - All other bits in the entries are cleared to zero. |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
650 |
ResourceMark rm; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
651 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
652 |
InstanceKlass* ik = constant_pool()->pool_holder(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
653 |
bool* f2_used = NEW_RESOURCE_ARRAY(bool, length()); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
654 |
memset(f2_used, 0, sizeof(bool) * length()); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
655 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
656 |
// Find all the slots that we need to preserve f2 |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
657 |
for (int i = 0; i < ik->methods()->length(); i++) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
658 |
Method* m = ik->methods()->at(i); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
659 |
RawBytecodeStream bcs(m); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
660 |
while (!bcs.is_last_bytecode()) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
661 |
Bytecodes::Code opcode = bcs.raw_next(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
662 |
switch (opcode) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
663 |
case Bytecodes::_invokedynamic: { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
664 |
int index = Bytes::get_native_u4(bcs.bcp() + 1); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
665 |
int cp_cache_index = constant_pool()->invokedynamic_cp_cache_index(index); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
666 |
f2_used[cp_cache_index] = 1; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
667 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
668 |
break; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
669 |
case Bytecodes::_invokehandle: { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
670 |
int cp_cache_index = Bytes::get_native_u2(bcs.bcp() + 1); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
671 |
f2_used[cp_cache_index] = 1; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
672 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
673 |
break; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
674 |
default: |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
675 |
break; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
676 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
677 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
678 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
679 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
680 |
if (check_only) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
681 |
DEBUG_ONLY( |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
682 |
for (int i=0; i<length(); i++) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
683 |
entry_at(i)->verify_just_initialized(f2_used[i]); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
684 |
}) |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
685 |
} else { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
686 |
for (int i=0; i<length(); i++) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
687 |
entry_at(i)->reinitialize(f2_used[i]); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
688 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
689 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
690 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47095
diff
changeset
|
691 |
|
47095
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
692 |
void ConstantPoolCache::deallocate_contents(ClassLoaderData* data) { |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
693 |
assert(!is_shared(), "shared caches are not deallocated"); |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
694 |
data->remove_handle(_resolved_references); |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
695 |
set_resolved_references(NULL); |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
696 |
MetadataFactory::free_array<u2>(data, _reference_map); |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
697 |
set_reference_map(NULL); |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
698 |
} |
9d21da6fe729
8181170: resolved_references array leaks for RedefineClasses
coleenp
parents:
46810
diff
changeset
|
699 |
|
46810
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
700 |
#if INCLUDE_CDS_JAVA_HEAP |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
701 |
oop ConstantPoolCache::archived_references() { |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
702 |
assert(UseSharedSpaces, "UseSharedSpaces expected."); |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
703 |
return oopDesc::decode_heap_oop(_archived_references); |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
704 |
} |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
705 |
|
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
706 |
void ConstantPoolCache::set_archived_references(oop o) { |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
707 |
assert(DumpSharedSpaces, "called only during runtime"); |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
708 |
_archived_references = oopDesc::encode_heap_oop(o); |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
709 |
} |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
710 |
#endif |
7dad333205cd
8179302: Pre-resolve constant pool string entries and cache resolved_reference arrays in CDS archive.
jiangli
parents:
46746
diff
changeset
|
711 |
|
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
712 |
#if INCLUDE_JVMTI |
1 | 713 |
// RedefineClasses() API support: |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
714 |
// If any entry of this ConstantPoolCache points to any of |
1 | 715 |
// old_methods, replace it with the corresponding new_method. |
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
716 |
void ConstantPoolCache::adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed) { |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
717 |
for (int i = 0; i < length(); i++) { |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
718 |
ConstantPoolCacheEntry* entry = entry_at(i); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
719 |
Method* old_method = entry->get_interesting_method_entry(holder); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
720 |
if (old_method == NULL || !old_method->is_old()) { |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
721 |
continue; // skip uninteresting entries |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
722 |
} |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
723 |
if (old_method->is_deleted()) { |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
724 |
// clean up entries with deleted methods |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
725 |
entry->initialize_entry(entry->constant_pool_index()); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
726 |
continue; |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
727 |
} |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
728 |
Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
729 |
|
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
730 |
assert(new_method != NULL, "method_with_idnum() should not be NULL"); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
731 |
assert(old_method != new_method, "sanity check"); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
732 |
|
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
733 |
entry_at(i)->adjust_method_entry(old_method, new_method, trace_name_printed); |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
734 |
} |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
735 |
} |
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
736 |
|
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
737 |
// the constant pool cache should never contain old or obsolete methods |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
738 |
bool ConstantPoolCache::check_no_old_or_obsolete_entries() { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
739 |
for (int i = 1; i < length(); i++) { |
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
740 |
if (entry_at(i)->get_interesting_method_entry(NULL) != NULL && |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
741 |
!entry_at(i)->check_no_old_or_obsolete_entries()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
742 |
return false; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
743 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
744 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
745 |
return true; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
746 |
} |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
747 |
|
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
748 |
void ConstantPoolCache::dump_cache() { |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
749 |
for (int i = 1; i < length(); i++) { |
29316
5287df8a8972
8046246: the constantPoolCacheOopDesc::adjust_method_entries() used in RedefineClasses does not scale
sspitsyn
parents:
29081
diff
changeset
|
750 |
if (entry_at(i)->get_interesting_method_entry(NULL) != NULL) { |
15591
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
751 |
entry_at(i)->print(tty, i); |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
752 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
753 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
754 |
} |
b8aa0577f137
7182152: Instrumentation hot swap test incorrect monitor count
dcubed
parents:
14490
diff
changeset
|
755 |
#endif // INCLUDE_JVMTI |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
756 |
|
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
757 |
void ConstantPoolCache::metaspace_pointers_do(MetaspaceClosure* it) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
758 |
log_trace(cds)("Iter(ConstantPoolCache): %p", this); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
759 |
it->push(&_constant_pool); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
760 |
it->push(&_reference_map); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46727
diff
changeset
|
761 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
762 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
763 |
// Printing |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
764 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
765 |
void ConstantPoolCache::print_on(outputStream* st) const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
766 |
assert(is_constantPoolCache(), "obj must be constant pool cache"); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
24351
diff
changeset
|
767 |
st->print_cr("%s", internal_name()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
768 |
// print constant pool cache entries |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
769 |
for (int i = 0; i < length(); i++) entry_at(i)->print(st, i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
770 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
771 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
772 |
void ConstantPoolCache::print_value_on(outputStream* st) const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
773 |
assert(is_constantPoolCache(), "obj must be constant pool cache"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
774 |
st->print("cache [%d]", length()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
775 |
print_address_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
776 |
st->print(" for "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
777 |
constant_pool()->print_value_on(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
778 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
779 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
780 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
781 |
// Verification |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
782 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
783 |
void ConstantPoolCache::verify_on(outputStream* st) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
784 |
guarantee(is_constantPoolCache(), "obj must be constant pool cache"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
785 |
// print constant pool cache entries |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
786 |
for (int i = 0; i < length(); i++) entry_at(i)->verify(st); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
787 |
} |