author | psandoz |
Fri, 08 Sep 2017 10:46:46 -0700 | |
changeset 48826 | c4d9d1b08e2e |
parent 48794 | ea0d0781c63c |
child 49372 | 3bb8b00832d0 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
48794
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4567
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4567
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:
4567
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
30764 | 26 |
#include "gc/shared/gcLocker.hpp" |
7397 | 27 |
#include "interpreter/bytecodes.hpp" |
28 |
#include "interpreter/interpreter.hpp" |
|
29 |
#include "interpreter/rewriter.hpp" |
|
46741
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
30 |
#include "memory/metadataFactory.hpp" |
7397 | 31 |
#include "memory/resourceArea.hpp" |
32 |
#include "oops/generateOopMap.hpp" |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
33 |
#include "prims/methodHandles.hpp" |
1 | 34 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
35 |
// Computes a CPC map (new_index -> original_index) for constant pool entries |
1 | 36 |
// that are referred to by the interpreter at runtime via the constant pool cache. |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
37 |
// Also computes a CP map (original_index -> new_index). |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
38 |
// Marks entries in CP which require additional processing. |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
39 |
void Rewriter::compute_index_maps() { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
40 |
const int length = _pool->length(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
41 |
init_maps(length); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
42 |
bool saw_mh_symbol = false; |
1 | 43 |
for (int i = 0; i < length; i++) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
44 |
int tag = _pool->tag_at(i).value(); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
45 |
switch (tag) { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
46 |
case JVM_CONSTANT_InterfaceMethodref: |
1 | 47 |
case JVM_CONSTANT_Fieldref : // fall through |
48 |
case JVM_CONSTANT_Methodref : // fall through |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
49 |
add_cp_cache_entry(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
50 |
break; |
48826 | 51 |
case JVM_CONSTANT_Dynamic: |
52 |
assert(_pool->has_dynamic_constant(), "constant pool's _has_dynamic_constant flag not set"); |
|
53 |
add_resolved_references_entry(i); |
|
54 |
break; |
|
55 |
case JVM_CONSTANT_String : // fall through |
|
5882 | 56 |
case JVM_CONSTANT_MethodHandle : // fall through |
57 |
case JVM_CONSTANT_MethodType : // fall through |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
58 |
add_resolved_references_entry(i); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
59 |
break; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
60 |
case JVM_CONSTANT_Utf8: |
36819 | 61 |
if (_pool->symbol_at(i) == vmSymbols::java_lang_invoke_MethodHandle() || |
62 |
_pool->symbol_at(i) == vmSymbols::java_lang_invoke_VarHandle()) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
63 |
saw_mh_symbol = true; |
36819 | 64 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
65 |
break; |
1 | 66 |
} |
67 |
} |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
68 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
69 |
// Record limits of resolved reference map for constant pool cache indices |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
70 |
record_map_limits(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
71 |
|
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
72 |
guarantee((int) _cp_cache_map.length() - 1 <= (int) ((u2)-1), |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
73 |
"all cp cache indexes fit in a u2"); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
74 |
|
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
75 |
if (saw_mh_symbol) { |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
76 |
_method_handle_invokers.at_grow(length, 0); |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
77 |
} |
1 | 78 |
} |
79 |
||
9971 | 80 |
// Unrewrite the bytecodes if an error occurs. |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
81 |
void Rewriter::restore_bytecodes() { |
9971 | 82 |
int len = _methods->length(); |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
83 |
bool invokespecial_error = false; |
9971 | 84 |
|
85 |
for (int i = len-1; i >= 0; i--) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
86 |
Method* method = _methods->at(i); |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
87 |
scan_method(method, true, &invokespecial_error); |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
88 |
assert(!invokespecial_error, "reversing should not get an invokespecial error"); |
9971 | 89 |
} |
90 |
} |
|
1 | 91 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
92 |
// Creates a constant pool cache given a CPC map |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
93 |
void Rewriter::make_constant_pool_cache(TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
94 |
ClassLoaderData* loader_data = _pool->pool_holder()->class_loader_data(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
95 |
ConstantPoolCache* cache = |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
96 |
ConstantPoolCache::allocate(loader_data, _cp_cache_map, |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
97 |
_invokedynamic_cp_cache_map, |
15928
f9d5c6e4107f
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
15799
diff
changeset
|
98 |
_invokedynamic_references_map, CHECK); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
99 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
100 |
// initialize object cache in constant pool |
46427
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46362
diff
changeset
|
101 |
_pool->set_cache(cache); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46362
diff
changeset
|
102 |
cache->set_constant_pool(_pool()); |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46362
diff
changeset
|
103 |
|
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46362
diff
changeset
|
104 |
// _resolved_references is stored in pool->cache(), so need to be done after |
54713555867e
8171392: Move Klass pointers outside of ConstantPool entries so ConstantPool can be read-only
iklam
parents:
46362
diff
changeset
|
105 |
// the above lines. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
106 |
_pool->initialize_resolved_references(loader_data, _resolved_references_map, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
107 |
_resolved_reference_limit, |
46741
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
108 |
THREAD); |
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
109 |
|
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
110 |
// Clean up constant pool cache if initialize_resolved_references() failed. |
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
111 |
if (HAS_PENDING_EXCEPTION) { |
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
112 |
MetadataFactory::free_metadata(loader_data, cache); |
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
113 |
_pool->set_cache(NULL); // so the verifier isn't confused |
d5a7407108b4
8180627: gc/gctests/Steal/steal001: guarantee(cp->cache() == NULL) failed
hseigel
parents:
46727
diff
changeset
|
114 |
} |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46783
diff
changeset
|
115 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46783
diff
changeset
|
116 |
DEBUG_ONLY( |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46783
diff
changeset
|
117 |
if (DumpSharedSpaces) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46783
diff
changeset
|
118 |
cache->verify_just_initialized(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46783
diff
changeset
|
119 |
}) |
1 | 120 |
} |
121 |
||
122 |
||
123 |
||
124 |
// The new finalization semantics says that registration of |
|
125 |
// finalizable objects must be performed on successful return from the |
|
126 |
// Object.<init> constructor. We could implement this trivially if |
|
127 |
// <init> were never rewritten but since JVMTI allows this to occur, a |
|
128 |
// more complicated solution is required. A special return bytecode |
|
129 |
// is used only by Object.<init> to signal the finalization |
|
130 |
// registration point. Additionally local 0 must be preserved so it's |
|
31587
e48945b7849c
8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents:
30764
diff
changeset
|
131 |
// available to pass to the registration function. For simplicity we |
1 | 132 |
// require that local 0 is never overwritten so it's available as an |
133 |
// argument for registration. |
|
134 |
||
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
135 |
void Rewriter::rewrite_Object_init(const methodHandle& method, TRAPS) { |
1 | 136 |
RawBytecodeStream bcs(method); |
137 |
while (!bcs.is_last_bytecode()) { |
|
138 |
Bytecodes::Code opcode = bcs.raw_next(); |
|
139 |
switch (opcode) { |
|
140 |
case Bytecodes::_return: *bcs.bcp() = Bytecodes::_return_register_finalizer; break; |
|
141 |
||
142 |
case Bytecodes::_istore: |
|
143 |
case Bytecodes::_lstore: |
|
144 |
case Bytecodes::_fstore: |
|
145 |
case Bytecodes::_dstore: |
|
146 |
case Bytecodes::_astore: |
|
147 |
if (bcs.get_index() != 0) continue; |
|
148 |
||
149 |
// fall through |
|
150 |
case Bytecodes::_istore_0: |
|
151 |
case Bytecodes::_lstore_0: |
|
152 |
case Bytecodes::_fstore_0: |
|
153 |
case Bytecodes::_dstore_0: |
|
154 |
case Bytecodes::_astore_0: |
|
155 |
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), |
|
156 |
"can't overwrite local 0 in Object.<init>"); |
|
157 |
break; |
|
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46427
diff
changeset
|
158 |
|
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46427
diff
changeset
|
159 |
default: |
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46427
diff
changeset
|
160 |
break; |
1 | 161 |
} |
162 |
} |
|
163 |
} |
|
164 |
||
165 |
||
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
166 |
// Rewrite a classfile-order CP index into a native-order CPC index. |
9971 | 167 |
void Rewriter::rewrite_member_reference(address bcp, int offset, bool reverse) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
168 |
address p = bcp + offset; |
9971 | 169 |
if (!reverse) { |
170 |
int cp_index = Bytes::get_Java_u2(p); |
|
171 |
int cache_index = cp_entry_to_cp_cache(cp_index); |
|
172 |
Bytes::put_native_u2(p, cache_index); |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
173 |
if (!_method_handle_invokers.is_empty()) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
174 |
maybe_rewrite_invokehandle(p - 1, cp_index, cache_index, reverse); |
9971 | 175 |
} else { |
176 |
int cache_index = Bytes::get_native_u2(p); |
|
177 |
int pool_index = cp_cache_entry_pool_index(cache_index); |
|
178 |
Bytes::put_Java_u2(p, pool_index); |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
179 |
if (!_method_handle_invokers.is_empty()) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
180 |
maybe_rewrite_invokehandle(p - 1, pool_index, cache_index, reverse); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
181 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
182 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
183 |
|
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
184 |
// If the constant pool entry for invokespecial is InterfaceMethodref, |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
185 |
// we need to add a separate cpCache entry for its resolution, because it is |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
186 |
// different than the resolution for invokeinterface with InterfaceMethodref. |
46362 | 187 |
// These cannot share cpCache entries. |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
188 |
void Rewriter::rewrite_invokespecial(address bcp, int offset, bool reverse, bool* invokespecial_error) { |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
189 |
address p = bcp + offset; |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
190 |
if (!reverse) { |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
191 |
int cp_index = Bytes::get_Java_u2(p); |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
192 |
if (_pool->tag_at(cp_index).is_interface_method()) { |
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
193 |
int cache_index = add_invokespecial_cp_cache_entry(cp_index); |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
194 |
if (cache_index != (int)(jushort) cache_index) { |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
195 |
*invokespecial_error = true; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
196 |
} |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
197 |
Bytes::put_native_u2(p, cache_index); |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
198 |
} else { |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
199 |
rewrite_member_reference(bcp, offset, reverse); |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
200 |
} |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
201 |
} else { |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
202 |
rewrite_member_reference(bcp, offset, reverse); |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
203 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
204 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
205 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
206 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
207 |
// Adjust the invocation bytecode for a signature-polymorphic method (MethodHandle.invoke, etc.) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
208 |
void Rewriter::maybe_rewrite_invokehandle(address opc, int cp_index, int cache_index, bool reverse) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
209 |
if (!reverse) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
210 |
if ((*opc) == (u1)Bytecodes::_invokevirtual || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
211 |
// allow invokespecial as an alias, although it would be very odd: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
212 |
(*opc) == (u1)Bytecodes::_invokespecial) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
213 |
assert(_pool->tag_at(cp_index).is_method(), "wrong index"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
214 |
// Determine whether this is a signature-polymorphic method. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
215 |
if (cp_index >= _method_handle_invokers.length()) return; |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
216 |
int status = _method_handle_invokers.at(cp_index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
217 |
assert(status >= -1 && status <= 1, "oob tri-state"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
218 |
if (status == 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
219 |
if (_pool->klass_ref_at_noresolve(cp_index) == vmSymbols::java_lang_invoke_MethodHandle() && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
220 |
MethodHandles::is_signature_polymorphic_name(SystemDictionary::MethodHandle_klass(), |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
221 |
_pool->name_ref_at(cp_index))) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
222 |
// we may need a resolved_refs entry for the appendix |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
223 |
add_invokedynamic_resolved_references_entries(cp_index, cache_index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
224 |
status = +1; |
36819 | 225 |
} else if (_pool->klass_ref_at_noresolve(cp_index) == vmSymbols::java_lang_invoke_VarHandle() && |
226 |
MethodHandles::is_signature_polymorphic_name(SystemDictionary::VarHandle_klass(), |
|
227 |
_pool->name_ref_at(cp_index))) { |
|
228 |
// we may need a resolved_refs entry for the appendix |
|
229 |
add_invokedynamic_resolved_references_entries(cp_index, cache_index); |
|
230 |
status = +1; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
231 |
} else { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
232 |
status = -1; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
233 |
} |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
234 |
_method_handle_invokers.at(cp_index) = status; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
235 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
236 |
// We use a special internal bytecode for such methods (if non-static). |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
237 |
// The basic reason for this is that such methods need an extra "appendix" argument |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
238 |
// to transmit the call site's intended call type. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
239 |
if (status > 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
240 |
(*opc) = (u1)Bytecodes::_invokehandle; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
241 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
242 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
243 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
244 |
// Do not need to look at cp_index. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
245 |
if ((*opc) == (u1)Bytecodes::_invokehandle) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
246 |
(*opc) = (u1)Bytecodes::_invokevirtual; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
247 |
// Ignore corner case of original _invokespecial instruction. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
248 |
// This is safe because (a) the signature polymorphic method was final, and |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
249 |
// (b) the implementation of MethodHandle will not call invokespecial on it. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
250 |
} |
9971 | 251 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
252 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
253 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
254 |
|
9971 | 255 |
void Rewriter::rewrite_invokedynamic(address bcp, int offset, bool reverse) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
256 |
address p = bcp + offset; |
9971 | 257 |
assert(p[-1] == Bytecodes::_invokedynamic, "not invokedynamic bytecode"); |
258 |
if (!reverse) { |
|
259 |
int cp_index = Bytes::get_Java_u2(p); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
260 |
int cache_index = add_invokedynamic_cp_cache_entry(cp_index); |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
261 |
int resolved_index = add_invokedynamic_resolved_references_entries(cp_index, cache_index); |
9971 | 262 |
// Replace the trailing four bytes with a CPC index for the dynamic |
263 |
// call site. Unlike other CPC entries, there is one per bytecode, |
|
264 |
// not just one per distinct CP entry. In other words, the |
|
265 |
// CPC-to-CP relation is many-to-one for invokedynamic entries. |
|
266 |
// This means we must use a larger index size than u2 to address |
|
267 |
// all these entries. That is the main reason invokedynamic |
|
268 |
// must have a five-byte instruction format. (Of course, other JVM |
|
269 |
// implementations can use the bytes for other purposes.) |
|
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
270 |
// Note: We use native_u4 format exclusively for 4-byte indexes. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
271 |
Bytes::put_native_u4(p, ConstantPool::encode_invokedynamic_index(cache_index)); |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
272 |
// add the bcp in case we need to patch this bytecode if we also find a |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
273 |
// invokespecial/InterfaceMethodref in the bytecode stream |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
274 |
_patch_invokedynamic_bcps->push(p); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
275 |
_patch_invokedynamic_refs->push(resolved_index); |
9971 | 276 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
277 |
int cache_index = ConstantPool::decode_invokedynamic_index( |
9971 | 278 |
Bytes::get_native_u4(p)); |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
279 |
// We will reverse the bytecode rewriting _after_ adjusting them. |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
280 |
// Adjust the cache index by offset to the invokedynamic entries in the |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
281 |
// cpCache plus the delta if the invokedynamic bytecodes were adjusted. |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
282 |
int adjustment = cp_cache_delta() + _first_iteration_cp_cache_limit; |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
283 |
int cp_index = invokedynamic_cp_cache_entry_pool_index(cache_index - adjustment); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
284 |
assert(_pool->tag_at(cp_index).is_invoke_dynamic(), "wrong index"); |
9971 | 285 |
// zero out 4 bytes |
286 |
Bytes::put_Java_u4(p, 0); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
287 |
Bytes::put_Java_u2(p, cp_index); |
9971 | 288 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
289 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
290 |
|
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
291 |
void Rewriter::patch_invokedynamic_bytecodes() { |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
292 |
// If the end of the cp_cache is the same as after initializing with the |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
293 |
// cpool, nothing needs to be done. Invokedynamic bytecodes are at the |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
294 |
// correct offsets. ie. no invokespecials added |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
295 |
int delta = cp_cache_delta(); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
296 |
if (delta > 0) { |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
297 |
int length = _patch_invokedynamic_bcps->length(); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
298 |
assert(length == _patch_invokedynamic_refs->length(), |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
299 |
"lengths should match"); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
300 |
for (int i = 0; i < length; i++) { |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
301 |
address p = _patch_invokedynamic_bcps->at(i); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
302 |
int cache_index = ConstantPool::decode_invokedynamic_index( |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
303 |
Bytes::get_native_u4(p)); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
304 |
Bytes::put_native_u4(p, ConstantPool::encode_invokedynamic_index(cache_index + delta)); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
305 |
|
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
306 |
// invokedynamic resolved references map also points to cp cache and must |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
307 |
// add delta to each. |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
308 |
int resolved_index = _patch_invokedynamic_refs->at(i); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
309 |
for (int entry = 0; entry < ConstantPoolCacheEntry::_indy_resolved_references_entries; entry++) { |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
310 |
assert(_invokedynamic_references_map.at(resolved_index + entry) == cache_index, |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
311 |
"should be the same index"); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
312 |
_invokedynamic_references_map.at_put(resolved_index+entry, |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
313 |
cache_index + delta); |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
314 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
315 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
316 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
317 |
} |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
318 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
319 |
|
5882 | 320 |
// Rewrite some ldc bytecodes to _fast_aldc |
9971 | 321 |
void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide, |
322 |
bool reverse) { |
|
323 |
if (!reverse) { |
|
324 |
assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), "not ldc bytecode"); |
|
325 |
address p = bcp + offset; |
|
326 |
int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p); |
|
327 |
constantTag tag = _pool->tag_at(cp_index).value(); |
|
48826 | 328 |
|
329 |
if (tag.is_method_handle() || |
|
330 |
tag.is_method_type() || |
|
331 |
tag.is_string() || |
|
332 |
(tag.is_dynamic_constant() && |
|
333 |
// keep regular ldc interpreter logic for condy primitives |
|
334 |
is_reference_type(FieldType::basic_type(_pool->uncached_signature_ref_at(cp_index)))) |
|
335 |
) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
336 |
int ref_index = cp_entry_to_resolved_references(cp_index); |
9971 | 337 |
if (is_wide) { |
338 |
(*bcp) = Bytecodes::_fast_aldc_w; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
339 |
assert(ref_index == (u2)ref_index, "index overflow"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
340 |
Bytes::put_native_u2(p, ref_index); |
9971 | 341 |
} else { |
342 |
(*bcp) = Bytecodes::_fast_aldc; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
343 |
assert(ref_index == (u1)ref_index, "index overflow"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
344 |
(*p) = (u1)ref_index; |
9971 | 345 |
} |
346 |
} |
|
347 |
} else { |
|
348 |
Bytecodes::Code rewritten_bc = |
|
349 |
(is_wide ? Bytecodes::_fast_aldc_w : Bytecodes::_fast_aldc); |
|
350 |
if ((*bcp) == rewritten_bc) { |
|
351 |
address p = bcp + offset; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
352 |
int ref_index = is_wide ? Bytes::get_native_u2(p) : (u1)(*p); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
353 |
int pool_index = resolved_references_entry_to_pool_index(ref_index); |
9971 | 354 |
if (is_wide) { |
355 |
(*bcp) = Bytecodes::_ldc_w; |
|
356 |
assert(pool_index == (u2)pool_index, "index overflow"); |
|
357 |
Bytes::put_Java_u2(p, pool_index); |
|
358 |
} else { |
|
359 |
(*bcp) = Bytecodes::_ldc; |
|
360 |
assert(pool_index == (u1)pool_index, "index overflow"); |
|
361 |
(*p) = (u1)pool_index; |
|
362 |
} |
|
5882 | 363 |
} |
364 |
} |
|
365 |
} |
|
366 |
||
367 |
||
1 | 368 |
// Rewrites a method given the index_map information |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
369 |
void Rewriter::scan_method(Method* method, bool reverse, bool* invokespecial_error) { |
1 | 370 |
|
371 |
int nof_jsrs = 0; |
|
372 |
bool has_monitor_bytecodes = false; |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
373 |
Bytecodes::Code c; |
1 | 374 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
375 |
// Bytecodes and their length |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
376 |
const address code_base = method->code_base(); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
377 |
const int code_length = method->code_size(); |
1 | 378 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
379 |
int bc_length; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
380 |
for (int bci = 0; bci < code_length; bci += bc_length) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
381 |
address bcp = code_base + bci; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
382 |
int prefix_length = 0; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
383 |
c = (Bytecodes::Code)(*bcp); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
384 |
|
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
385 |
// Since we have the code, see if we can get the length |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
386 |
// directly. Some more complicated bytecodes will report |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
387 |
// a length of zero, meaning we need to make another method |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
388 |
// call to calculate the length. |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
389 |
bc_length = Bytecodes::length_for(c); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
390 |
if (bc_length == 0) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
391 |
bc_length = Bytecodes::length_at(method, bcp); |
1 | 392 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
393 |
// length_at will put us at the bytecode after the one modified |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
394 |
// by 'wide'. We don't currently examine any of the bytecodes |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
395 |
// modified by wide, but in case we do in the future... |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
396 |
if (c == Bytecodes::_wide) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
397 |
prefix_length = 1; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
398 |
c = (Bytecodes::Code)bcp[1]; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
399 |
} |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
400 |
} |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
401 |
|
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
402 |
assert(bc_length != 0, "impossible bytecode length"); |
1 | 403 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
404 |
switch (c) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
405 |
case Bytecodes::_lookupswitch : { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
406 |
#ifndef CC_INTERP |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
407 |
Bytecode_lookupswitch bc(method, bcp); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
408 |
(*bcp) = ( |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
409 |
bc.number_of_pairs() < BinarySwitchThreshold |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
410 |
? Bytecodes::_fast_linearswitch |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
411 |
: Bytecodes::_fast_binaryswitch |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
412 |
); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
413 |
#endif |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
414 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
415 |
} |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
416 |
case Bytecodes::_fast_linearswitch: |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
417 |
case Bytecodes::_fast_binaryswitch: { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
418 |
#ifndef CC_INTERP |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
419 |
(*bcp) = Bytecodes::_lookupswitch; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
420 |
#endif |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
421 |
break; |
1 | 422 |
} |
423 |
||
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
424 |
case Bytecodes::_invokespecial : { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
425 |
rewrite_invokespecial(bcp, prefix_length+1, reverse, invokespecial_error); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
426 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
427 |
} |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
428 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
429 |
case Bytecodes::_putstatic : |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
430 |
case Bytecodes::_putfield : { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
431 |
if (!reverse) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
432 |
// Check if any final field of the class given as parameter is modified |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
433 |
// outside of initializer methods of the class. Fields that are modified |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
434 |
// are marked with a flag. For marked fields, the compilers do not perform |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
435 |
// constant folding (as the field can be changed after initialization). |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
436 |
// |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
437 |
// The check is performed after verification and only if verification has |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
438 |
// succeeded. Therefore, the class is guaranteed to be well-formed. |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
439 |
InstanceKlass* klass = method->method_holder(); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
440 |
u2 bc_index = Bytes::get_Java_u2(bcp + prefix_length + 1); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
441 |
constantPoolHandle cp(method->constants()); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
442 |
Symbol* ref_class_name = cp->klass_name_at(cp->klass_ref_index_at(bc_index)); |
39421
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
443 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
444 |
if (klass->name() == ref_class_name) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
445 |
Symbol* field_name = cp->name_ref_at(bc_index); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
446 |
Symbol* field_sig = cp->signature_ref_at(bc_index); |
39619
905b6eee37b3
8160551: assert(c == Bytecodes::_putfield) failed: must be putfield
coleenp
parents:
39421
diff
changeset
|
447 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
448 |
fieldDescriptor fd; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
449 |
if (klass->find_field(field_name, field_sig, &fd) != NULL) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
450 |
if (fd.access_flags().is_final()) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
451 |
if (fd.access_flags().is_static()) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
452 |
if (!method->is_static_initializer()) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
453 |
fd.set_has_initialized_final_update(true); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
454 |
} |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
455 |
} else { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
456 |
if (!method->is_object_initializer()) { |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
457 |
fd.set_has_initialized_final_update(true); |
39421
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
458 |
} |
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
459 |
} |
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
460 |
} |
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
461 |
} |
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
462 |
} |
a9652c919db8
8157181: Compilers accept modification of final fields outside initializer methods
zmajo
parents:
38031
diff
changeset
|
463 |
} |
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
464 |
} |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
465 |
// fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
466 |
case Bytecodes::_getstatic : // fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
467 |
case Bytecodes::_getfield : // fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
468 |
case Bytecodes::_invokevirtual : // fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
469 |
case Bytecodes::_invokestatic : |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
470 |
case Bytecodes::_invokeinterface: |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
471 |
case Bytecodes::_invokehandle : // if reverse=true |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
472 |
rewrite_member_reference(bcp, prefix_length+1, reverse); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
473 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
474 |
case Bytecodes::_invokedynamic: |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
475 |
rewrite_invokedynamic(bcp, prefix_length+1, reverse); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
476 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
477 |
case Bytecodes::_ldc: |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
478 |
case Bytecodes::_fast_aldc: // if reverse=true |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
479 |
maybe_rewrite_ldc(bcp, prefix_length+1, false, reverse); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
480 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
481 |
case Bytecodes::_ldc_w: |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
482 |
case Bytecodes::_fast_aldc_w: // if reverse=true |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
483 |
maybe_rewrite_ldc(bcp, prefix_length+1, true, reverse); |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
484 |
break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
485 |
case Bytecodes::_jsr : // fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
486 |
case Bytecodes::_jsr_w : nof_jsrs++; break; |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
487 |
case Bytecodes::_monitorenter : // fall through |
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
488 |
case Bytecodes::_monitorexit : has_monitor_bytecodes = true; break; |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46427
diff
changeset
|
489 |
|
46783
bfa353c0d440
8068317: No_Safepoint_Verifier is not necessary in Rewriter::scan_method
coleenp
parents:
46741
diff
changeset
|
490 |
default: break; |
1 | 491 |
} |
492 |
} |
|
493 |
||
494 |
// Update access flags |
|
495 |
if (has_monitor_bytecodes) { |
|
496 |
method->set_has_monitor_bytecodes(); |
|
497 |
} |
|
498 |
||
499 |
// The present of a jsr bytecode implies that the method might potentially |
|
500 |
// have to be rewritten, so we run the oopMapGenerator on the method |
|
501 |
if (nof_jsrs > 0) { |
|
502 |
method->set_has_jsrs(); |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
503 |
// Second pass will revisit this method. |
9971 | 504 |
assert(method->has_jsrs(), "didn't we just set this?"); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
505 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
506 |
} |
1 | 507 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
508 |
// After constant pool is created, revisit methods containing jsrs. |
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
509 |
methodHandle Rewriter::rewrite_jsrs(const methodHandle& method, TRAPS) { |
9971 | 510 |
ResourceMark rm(THREAD); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
511 |
ResolveOopMapConflicts romc(method); |
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
512 |
methodHandle new_method = romc.do_potential_rewrite(CHECK_(methodHandle())); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
513 |
// Update monitor matching info. |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
514 |
if (romc.monitor_safe()) { |
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
515 |
new_method->set_guaranteed_monitor_matching(); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
516 |
} |
1 | 517 |
|
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46630
diff
changeset
|
518 |
return new_method; |
1 | 519 |
} |
520 |
||
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
521 |
void Rewriter::rewrite_bytecodes(TRAPS) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
522 |
assert(_pool->cache() == NULL, "constant pool cache must not be set yet"); |
1 | 523 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
524 |
// determine index maps for Method* rewriting |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
525 |
compute_index_maps(); |
1 | 526 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
527 |
if (RegisterFinalizersAtInit && _klass->name() == vmSymbols::java_lang_Object()) { |
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2570
diff
changeset
|
528 |
bool did_rewrite = false; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
529 |
int i = _methods->length(); |
1 | 530 |
while (i-- > 0) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
531 |
Method* method = _methods->at(i); |
1 | 532 |
if (method->intrinsic_id() == vmIntrinsics::_Object_init) { |
533 |
// rewrite the return bytecodes of Object.<init> to register the |
|
534 |
// object for finalization if needed. |
|
535 |
methodHandle m(THREAD, method); |
|
536 |
rewrite_Object_init(m, CHECK); |
|
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2570
diff
changeset
|
537 |
did_rewrite = true; |
1 | 538 |
break; |
539 |
} |
|
540 |
} |
|
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2570
diff
changeset
|
541 |
assert(did_rewrite, "must find Object::<init> to rewrite it"); |
1 | 542 |
} |
543 |
||
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
544 |
// rewrite methods, in two passes |
9971 | 545 |
int len = _methods->length(); |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
546 |
bool invokespecial_error = false; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
547 |
|
9971 | 548 |
for (int i = len-1; i >= 0; i--) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
549 |
Method* method = _methods->at(i); |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
550 |
scan_method(method, false, &invokespecial_error); |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
551 |
if (invokespecial_error) { |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
552 |
// If you get an error here, there is no reversing bytecodes |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
553 |
// This exception is stored for this class and no further attempt is |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
554 |
// made at verifying or rewriting. |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
555 |
THROW_MSG(vmSymbols::java_lang_InternalError(), |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
556 |
"This classfile overflows invokespecial for interfaces " |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
557 |
"and cannot be loaded"); |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
558 |
return; |
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
559 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
560 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
561 |
|
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
562 |
// May have to fix invokedynamic bytecodes if invokestatic/InterfaceMethodref |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
563 |
// entries had to be added. |
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
564 |
patch_invokedynamic_bytecodes(); |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
565 |
} |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
566 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
42870
diff
changeset
|
567 |
void Rewriter::rewrite(InstanceKlass* klass, TRAPS) { |
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
568 |
if (!DumpSharedSpaces) { |
48794
ea0d0781c63c
8178351: Simplify MetaspaceShared::is_in_shared_space and MetaspaceObj::is_shared
iklam
parents:
47216
diff
changeset
|
569 |
assert(!klass->is_shared(), "archive methods must not be rewritten at run time"); |
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
22750
diff
changeset
|
570 |
} |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
571 |
ResourceMark rm(THREAD); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
572 |
Rewriter rw(klass, klass->constants(), klass->methods(), CHECK); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
573 |
// (That's all, folks.) |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
574 |
} |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
575 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
42870
diff
changeset
|
576 |
Rewriter::Rewriter(InstanceKlass* klass, const constantPoolHandle& cpool, Array<Method*>* methods, TRAPS) |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
577 |
: _klass(klass), |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
578 |
_pool(cpool), |
38031
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
579 |
_methods(methods), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
580 |
_cp_map(cpool->length()), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
581 |
_cp_cache_map(cpool->length() / 2), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
582 |
_reference_map(cpool->length()), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
583 |
_resolved_references_map(cpool->length() / 2), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
584 |
_invokedynamic_references_map(cpool->length() / 2), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
585 |
_method_handle_invokers(cpool->length()), |
e0b822facc03
8149374: Replace C1-specific collection classes with universal collection classes
fzhinkin
parents:
36819
diff
changeset
|
586 |
_invokedynamic_cp_cache_map(cpool->length() / 4) |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
587 |
{ |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
588 |
|
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
589 |
// Rewrite bytecodes - exception here exits. |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
590 |
rewrite_bytecodes(CHECK); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
591 |
|
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
592 |
// Stress restoring bytecodes |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
593 |
if (StressRewriter) { |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
594 |
restore_bytecodes(); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
595 |
rewrite_bytecodes(CHECK); |
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
596 |
} |
21557
55115e0708f1
8025937: assert(existing_f1 == NULL || existing_f1 == f1) failed: illegal field change
coleenp
parents:
15928
diff
changeset
|
597 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
598 |
// allocate constant pool cache, now that we've seen all the bytecodes |
9971 | 599 |
make_constant_pool_cache(THREAD); |
600 |
||
601 |
// Restore bytecodes to their unrewritten state if there are exceptions |
|
602 |
// rewriting bytecodes or allocating the cpCache |
|
603 |
if (HAS_PENDING_EXCEPTION) { |
|
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
604 |
restore_bytecodes(); |
9971 | 605 |
return; |
606 |
} |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
607 |
|
15099
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
608 |
// Relocate after everything, but still do this under the is_rewritten flag, |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
609 |
// so methods with jsrs in custom class lists in aren't attempted to be |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
610 |
// rewritten in the RO section of the shared archive. |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
611 |
// Relocated bytecodes don't have to be restored, only the cp cache entries |
22750
a3c879b18f22
8033528: assert(0 <= i && i < length()) failed: index out of bounds
coleenp
parents:
21734
diff
changeset
|
612 |
int len = _methods->length(); |
9971 | 613 |
for (int i = len-1; i >= 0; i--) { |
15099
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
614 |
methodHandle m(THREAD, _methods->at(i)); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
615 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
616 |
if (m->has_jsrs()) { |
15099
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
617 |
m = rewrite_jsrs(m, THREAD); |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
618 |
// Restore bytecodes to their unrewritten state if there are exceptions |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
619 |
// relocating bytecodes. If some are relocated, that is ok because that |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
620 |
// doesn't affect constant pool to cpCache rewriting. |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
621 |
if (HAS_PENDING_EXCEPTION) { |
21734
440a9598dc23
8028347: Rewriter::scan_method asserts with array oob in RT_Baseline
coleenp
parents:
21557
diff
changeset
|
622 |
restore_bytecodes(); |
15099
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
623 |
return; |
b31d40895bbb
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
13929
diff
changeset
|
624 |
} |
1 | 625 |
// Method might have gotten rewritten. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
626 |
methods->at_put(i, m()); |
1 | 627 |
} |
628 |
} |
|
629 |
} |