author | coleenp |
Sat, 01 Sep 2012 13:25:18 -0400 | |
changeset 13728 | 882756847a04 |
parent 13391 | 30245956af37 |
child 13929 | 8da0dc50a6e4 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
2 |
* Copyright (c) 1998, 2012, 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" |
26 |
#include "interpreter/bytecodes.hpp" |
|
27 |
#include "interpreter/interpreter.hpp" |
|
28 |
#include "interpreter/rewriter.hpp" |
|
29 |
#include "memory/gcLocker.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
30 |
#include "memory/metadataFactory.hpp" |
7397 | 31 |
#include "memory/oopFactory.hpp" |
32 |
#include "memory/resourceArea.hpp" |
|
33 |
#include "oops/generateOopMap.hpp" |
|
34 |
#include "oops/objArrayOop.hpp" |
|
35 |
#include "oops/oop.inline.hpp" |
|
36 |
#include "prims/methodComparator.hpp" |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
37 |
#include "prims/methodHandles.hpp" |
1 | 38 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
39 |
// Computes a CPC map (new_index -> original_index) for constant pool entries |
1 | 40 |
// 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
|
41 |
// Also computes a CP map (original_index -> new_index). |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
42 |
// Marks entries in CP which require additional processing. |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
43 |
void Rewriter::compute_index_maps() { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
44 |
const int length = _pool->length(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
45 |
init_maps(length); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
46 |
bool saw_mh_symbol = false; |
1 | 47 |
for (int i = 0; i < length; i++) { |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
48 |
int tag = _pool->tag_at(i).value(); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
49 |
switch (tag) { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
50 |
case JVM_CONSTANT_InterfaceMethodref: |
1 | 51 |
case JVM_CONSTANT_Fieldref : // fall through |
52 |
case JVM_CONSTANT_Methodref : // fall through |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
53 |
add_cp_cache_entry(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
54 |
break; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
55 |
case JVM_CONSTANT_String: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
56 |
case JVM_CONSTANT_Object: |
5882 | 57 |
case JVM_CONSTANT_MethodHandle : // fall through |
58 |
case JVM_CONSTANT_MethodType : // fall through |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
59 |
add_resolved_references_entry(i); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
60 |
break; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
61 |
case JVM_CONSTANT_Utf8: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
62 |
if (_pool->symbol_at(i) == vmSymbols::java_lang_invoke_MethodHandle()) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
63 |
saw_mh_symbol = true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
64 |
break; |
1 | 65 |
} |
66 |
} |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
67 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
68 |
// 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
|
69 |
record_map_limits(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
70 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
71 |
guarantee((int)_cp_cache_map.length()-1 <= (int)((u2)-1), |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
72 |
"all cp cache indexes fit in a u2"); |
6062
bab93afe9df7
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
5882
diff
changeset
|
73 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
74 |
if (saw_mh_symbol) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
75 |
_method_handle_invokers.initialize(length, (int)0); |
1 | 76 |
} |
77 |
||
9971 | 78 |
// Unrewrite the bytecodes if an error occurs. |
79 |
void Rewriter::restore_bytecodes() { |
|
80 |
int len = _methods->length(); |
|
81 |
||
82 |
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
|
83 |
Method* method = _methods->at(i); |
9971 | 84 |
scan_method(method, true); |
85 |
} |
|
86 |
} |
|
1 | 87 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
88 |
// Creates a constant pool cache given a CPC map |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
89 |
void Rewriter::make_constant_pool_cache(TRAPS) { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
90 |
const int length = _cp_cache_map.length(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
91 |
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
|
92 |
ConstantPoolCache* cache = |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
93 |
ConstantPoolCache::allocate(loader_data, length, CHECK); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
94 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
95 |
// initialize object cache in constant pool |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
96 |
_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
|
97 |
_resolved_reference_limit, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
98 |
CHECK); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
99 |
|
8296
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
7913
diff
changeset
|
100 |
No_Safepoint_Verifier nsv; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
101 |
cache->initialize(_cp_cache_map, _invokedynamic_references_map); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
102 |
_pool->set_cache(cache); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
103 |
cache->set_constant_pool(_pool()); |
1 | 104 |
} |
105 |
||
106 |
||
107 |
||
108 |
// The new finalization semantics says that registration of |
|
109 |
// finalizable objects must be performed on successful return from the |
|
110 |
// Object.<init> constructor. We could implement this trivially if |
|
111 |
// <init> were never rewritten but since JVMTI allows this to occur, a |
|
112 |
// more complicated solution is required. A special return bytecode |
|
113 |
// is used only by Object.<init> to signal the finalization |
|
114 |
// registration point. Additionally local 0 must be preserved so it's |
|
115 |
// available to pass to the registration function. For simplicty we |
|
116 |
// require that local 0 is never overwritten so it's available as an |
|
117 |
// argument for registration. |
|
118 |
||
119 |
void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) { |
|
120 |
RawBytecodeStream bcs(method); |
|
121 |
while (!bcs.is_last_bytecode()) { |
|
122 |
Bytecodes::Code opcode = bcs.raw_next(); |
|
123 |
switch (opcode) { |
|
124 |
case Bytecodes::_return: *bcs.bcp() = Bytecodes::_return_register_finalizer; break; |
|
125 |
||
126 |
case Bytecodes::_istore: |
|
127 |
case Bytecodes::_lstore: |
|
128 |
case Bytecodes::_fstore: |
|
129 |
case Bytecodes::_dstore: |
|
130 |
case Bytecodes::_astore: |
|
131 |
if (bcs.get_index() != 0) continue; |
|
132 |
||
133 |
// fall through |
|
134 |
case Bytecodes::_istore_0: |
|
135 |
case Bytecodes::_lstore_0: |
|
136 |
case Bytecodes::_fstore_0: |
|
137 |
case Bytecodes::_dstore_0: |
|
138 |
case Bytecodes::_astore_0: |
|
139 |
THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), |
|
140 |
"can't overwrite local 0 in Object.<init>"); |
|
141 |
break; |
|
142 |
} |
|
143 |
} |
|
144 |
} |
|
145 |
||
146 |
||
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
147 |
// Rewrite a classfile-order CP index into a native-order CPC index. |
9971 | 148 |
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
|
149 |
address p = bcp + offset; |
9971 | 150 |
if (!reverse) { |
151 |
int cp_index = Bytes::get_Java_u2(p); |
|
152 |
int cache_index = cp_entry_to_cp_cache(cp_index); |
|
153 |
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
|
154 |
if (!_method_handle_invokers.is_empty()) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
155 |
maybe_rewrite_invokehandle(p - 1, cp_index, cache_index, reverse); |
9971 | 156 |
} else { |
157 |
int cache_index = Bytes::get_native_u2(p); |
|
158 |
int pool_index = cp_cache_entry_pool_index(cache_index); |
|
159 |
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
|
160 |
if (!_method_handle_invokers.is_empty()) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
161 |
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
|
162 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
163 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
164 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
165 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
166 |
// 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
|
167 |
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
|
168 |
if (!reverse) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
169 |
if ((*opc) == (u1)Bytecodes::_invokevirtual || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
170 |
// 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
|
171 |
(*opc) == (u1)Bytecodes::_invokespecial) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
172 |
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
|
173 |
// 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
|
174 |
if (cp_index >= _method_handle_invokers.length()) return; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
175 |
int status = _method_handle_invokers[cp_index]; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
176 |
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
|
177 |
if (status == 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
178 |
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
|
179 |
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
|
180 |
_pool->name_ref_at(cp_index))) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
181 |
// we may need a resolved_refs entry for the appendix |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
182 |
add_invokedynamic_resolved_references_entry(cp_index, cache_index); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
183 |
status = +1; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
184 |
} else { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
185 |
status = -1; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
186 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
187 |
_method_handle_invokers[cp_index] = status; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
188 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
189 |
// 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
|
190 |
// 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
|
191 |
// 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
|
192 |
if (status > 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
193 |
(*opc) = (u1)Bytecodes::_invokehandle; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
194 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
195 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
196 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
197 |
// 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
|
198 |
if ((*opc) == (u1)Bytecodes::_invokehandle) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
199 |
(*opc) = (u1)Bytecodes::_invokevirtual; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
200 |
// 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
|
201 |
// 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
|
202 |
// (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
|
203 |
} |
9971 | 204 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
205 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
206 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
207 |
|
9971 | 208 |
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
|
209 |
address p = bcp + offset; |
9971 | 210 |
assert(p[-1] == Bytecodes::_invokedynamic, "not invokedynamic bytecode"); |
211 |
if (!reverse) { |
|
212 |
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
|
213 |
int cache_index = add_invokedynamic_cp_cache_entry(cp_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
214 |
add_invokedynamic_resolved_references_entry(cp_index, cache_index); |
9971 | 215 |
// Replace the trailing four bytes with a CPC index for the dynamic |
216 |
// call site. Unlike other CPC entries, there is one per bytecode, |
|
217 |
// not just one per distinct CP entry. In other words, the |
|
218 |
// CPC-to-CP relation is many-to-one for invokedynamic entries. |
|
219 |
// This means we must use a larger index size than u2 to address |
|
220 |
// all these entries. That is the main reason invokedynamic |
|
221 |
// must have a five-byte instruction format. (Of course, other JVM |
|
222 |
// implementations can use the bytes for other purposes.) |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
223 |
Bytes::put_native_u4(p, ConstantPool::encode_invokedynamic_index(cache_index)); |
9971 | 224 |
// Note: We use native_u4 format exclusively for 4-byte indexes. |
225 |
} else { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
226 |
// callsite index |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
227 |
int cache_index = ConstantPool::decode_invokedynamic_index( |
9971 | 228 |
Bytes::get_native_u4(p)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
229 |
int cp_index = cp_cache_entry_pool_index(cache_index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
230 |
assert(_pool->tag_at(cp_index).is_invoke_dynamic(), "wrong index"); |
9971 | 231 |
// zero out 4 bytes |
232 |
Bytes::put_Java_u4(p, 0); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
233 |
Bytes::put_Java_u2(p, cp_index); |
9971 | 234 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
235 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
236 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
237 |
|
5882 | 238 |
// Rewrite some ldc bytecodes to _fast_aldc |
9971 | 239 |
void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide, |
240 |
bool reverse) { |
|
241 |
if (!reverse) { |
|
242 |
assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), "not ldc bytecode"); |
|
243 |
address p = bcp + offset; |
|
244 |
int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p); |
|
245 |
constantTag tag = _pool->tag_at(cp_index).value(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
246 |
if (tag.is_method_handle() || tag.is_method_type() || tag.is_string() || tag.is_object()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
247 |
int ref_index = cp_entry_to_resolved_references(cp_index); |
9971 | 248 |
if (is_wide) { |
249 |
(*bcp) = Bytecodes::_fast_aldc_w; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
250 |
assert(ref_index == (u2)ref_index, "index overflow"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
251 |
Bytes::put_native_u2(p, ref_index); |
9971 | 252 |
} else { |
253 |
(*bcp) = Bytecodes::_fast_aldc; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
254 |
assert(ref_index == (u1)ref_index, "index overflow"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
255 |
(*p) = (u1)ref_index; |
9971 | 256 |
} |
257 |
} |
|
258 |
} else { |
|
259 |
Bytecodes::Code rewritten_bc = |
|
260 |
(is_wide ? Bytecodes::_fast_aldc_w : Bytecodes::_fast_aldc); |
|
261 |
if ((*bcp) == rewritten_bc) { |
|
262 |
address p = bcp + offset; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
263 |
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
|
264 |
int pool_index = resolved_references_entry_to_pool_index(ref_index); |
9971 | 265 |
if (is_wide) { |
266 |
(*bcp) = Bytecodes::_ldc_w; |
|
267 |
assert(pool_index == (u2)pool_index, "index overflow"); |
|
268 |
Bytes::put_Java_u2(p, pool_index); |
|
269 |
} else { |
|
270 |
(*bcp) = Bytecodes::_ldc; |
|
271 |
assert(pool_index == (u1)pool_index, "index overflow"); |
|
272 |
(*p) = (u1)pool_index; |
|
273 |
} |
|
5882 | 274 |
} |
275 |
} |
|
276 |
} |
|
277 |
||
278 |
||
1 | 279 |
// Rewrites a method given the index_map information |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
280 |
void Rewriter::scan_method(Method* method, bool reverse) { |
1 | 281 |
|
282 |
int nof_jsrs = 0; |
|
283 |
bool has_monitor_bytecodes = false; |
|
284 |
||
285 |
{ |
|
286 |
// We cannot tolerate a GC in this block, because we've |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
287 |
// cached the bytecodes in 'code_base'. If the Method* |
1 | 288 |
// moves, the bytecodes will also move. |
289 |
No_Safepoint_Verifier nsv; |
|
290 |
Bytecodes::Code c; |
|
291 |
||
292 |
// Bytecodes and their length |
|
293 |
const address code_base = method->code_base(); |
|
294 |
const int code_length = method->code_size(); |
|
295 |
||
296 |
int bc_length; |
|
297 |
for (int bci = 0; bci < code_length; bci += bc_length) { |
|
298 |
address bcp = code_base + bci; |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
299 |
int prefix_length = 0; |
1 | 300 |
c = (Bytecodes::Code)(*bcp); |
301 |
||
302 |
// Since we have the code, see if we can get the length |
|
303 |
// directly. Some more complicated bytecodes will report |
|
304 |
// a length of zero, meaning we need to make another method |
|
305 |
// call to calculate the length. |
|
306 |
bc_length = Bytecodes::length_for(c); |
|
307 |
if (bc_length == 0) { |
|
7913 | 308 |
bc_length = Bytecodes::length_at(method, bcp); |
1 | 309 |
|
310 |
// length_at will put us at the bytecode after the one modified |
|
311 |
// by 'wide'. We don't currently examine any of the bytecodes |
|
312 |
// modified by wide, but in case we do in the future... |
|
313 |
if (c == Bytecodes::_wide) { |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
314 |
prefix_length = 1; |
1 | 315 |
c = (Bytecodes::Code)bcp[1]; |
316 |
} |
|
317 |
} |
|
318 |
||
319 |
assert(bc_length != 0, "impossible bytecode length"); |
|
320 |
||
321 |
switch (c) { |
|
322 |
case Bytecodes::_lookupswitch : { |
|
323 |
#ifndef CC_INTERP |
|
7913 | 324 |
Bytecode_lookupswitch bc(method, bcp); |
5688 | 325 |
(*bcp) = ( |
7913 | 326 |
bc.number_of_pairs() < BinarySwitchThreshold |
1 | 327 |
? Bytecodes::_fast_linearswitch |
328 |
: Bytecodes::_fast_binaryswitch |
|
329 |
); |
|
330 |
#endif |
|
331 |
break; |
|
332 |
} |
|
9971 | 333 |
case Bytecodes::_fast_linearswitch: |
334 |
case Bytecodes::_fast_binaryswitch: { |
|
335 |
#ifndef CC_INTERP |
|
336 |
(*bcp) = Bytecodes::_lookupswitch; |
|
337 |
#endif |
|
338 |
break; |
|
339 |
} |
|
1 | 340 |
case Bytecodes::_getstatic : // fall through |
341 |
case Bytecodes::_putstatic : // fall through |
|
342 |
case Bytecodes::_getfield : // fall through |
|
343 |
case Bytecodes::_putfield : // fall through |
|
344 |
case Bytecodes::_invokevirtual : // fall through |
|
345 |
case Bytecodes::_invokespecial : // fall through |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
346 |
case Bytecodes::_invokestatic : |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
347 |
case Bytecodes::_invokeinterface: |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
348 |
case Bytecodes::_invokehandle : // if reverse=true |
9971 | 349 |
rewrite_member_reference(bcp, prefix_length+1, reverse); |
1 | 350 |
break; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
351 |
case Bytecodes::_invokedynamic: |
9971 | 352 |
rewrite_invokedynamic(bcp, prefix_length+1, reverse); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
353 |
break; |
5882 | 354 |
case Bytecodes::_ldc: |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
355 |
case Bytecodes::_fast_aldc: // if reverse=true |
9971 | 356 |
maybe_rewrite_ldc(bcp, prefix_length+1, false, reverse); |
5882 | 357 |
break; |
358 |
case Bytecodes::_ldc_w: |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
9971
diff
changeset
|
359 |
case Bytecodes::_fast_aldc_w: // if reverse=true |
9971 | 360 |
maybe_rewrite_ldc(bcp, prefix_length+1, true, reverse); |
5882 | 361 |
break; |
1 | 362 |
case Bytecodes::_jsr : // fall through |
363 |
case Bytecodes::_jsr_w : nof_jsrs++; break; |
|
364 |
case Bytecodes::_monitorenter : // fall through |
|
365 |
case Bytecodes::_monitorexit : has_monitor_bytecodes = true; break; |
|
366 |
} |
|
367 |
} |
|
368 |
} |
|
369 |
||
370 |
// Update access flags |
|
371 |
if (has_monitor_bytecodes) { |
|
372 |
method->set_has_monitor_bytecodes(); |
|
373 |
} |
|
374 |
||
375 |
// The present of a jsr bytecode implies that the method might potentially |
|
376 |
// have to be rewritten, so we run the oopMapGenerator on the method |
|
377 |
if (nof_jsrs > 0) { |
|
378 |
method->set_has_jsrs(); |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
379 |
// Second pass will revisit this method. |
9971 | 380 |
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
|
381 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
382 |
} |
1 | 383 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
384 |
// After constant pool is created, revisit methods containing jsrs. |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
385 |
methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) { |
9971 | 386 |
ResourceMark rm(THREAD); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
387 |
ResolveOopMapConflicts romc(method); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
388 |
methodHandle original_method = method; |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
389 |
method = romc.do_potential_rewrite(CHECK_(methodHandle())); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
390 |
// Update monitor matching info. |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
391 |
if (romc.monitor_safe()) { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
392 |
method->set_guaranteed_monitor_matching(); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
393 |
} |
1 | 394 |
|
395 |
return method; |
|
396 |
} |
|
397 |
||
398 |
void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) { |
|
399 |
ResourceMark rm(THREAD); |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
400 |
Rewriter rw(klass, klass->constants(), klass->methods(), CHECK); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
401 |
// (That's all, folks.) |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
402 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
403 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
404 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
405 |
void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, Array<Method*>* methods, TRAPS) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
406 |
ResourceMark rm(THREAD); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
407 |
Rewriter rw(klass, cpool, methods, CHECK); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
408 |
// (That's all, folks.) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
409 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
410 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
411 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
412 |
Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, Array<Method*>* methods, TRAPS) |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
413 |
: _klass(klass), |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
414 |
_pool(cpool), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4429
diff
changeset
|
415 |
_methods(methods) |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
416 |
{ |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
417 |
assert(_pool->cache() == NULL, "constant pool cache must not be set yet"); |
1 | 418 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
419 |
// determine index maps for Method* rewriting |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
420 |
compute_index_maps(); |
1 | 421 |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
422 |
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
|
423 |
bool did_rewrite = false; |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
424 |
int i = _methods->length(); |
1 | 425 |
while (i-- > 0) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
426 |
Method* method = _methods->at(i); |
1 | 427 |
if (method->intrinsic_id() == vmIntrinsics::_Object_init) { |
428 |
// rewrite the return bytecodes of Object.<init> to register the |
|
429 |
// object for finalization if needed. |
|
430 |
methodHandle m(THREAD, method); |
|
431 |
rewrite_Object_init(m, CHECK); |
|
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2570
diff
changeset
|
432 |
did_rewrite = true; |
1 | 433 |
break; |
434 |
} |
|
435 |
} |
|
3273
6acf7084b1d3
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
2570
diff
changeset
|
436 |
assert(did_rewrite, "must find Object::<init> to rewrite it"); |
1 | 437 |
} |
438 |
||
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
439 |
// rewrite methods, in two passes |
9971 | 440 |
int len = _methods->length(); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
441 |
|
9971 | 442 |
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
|
443 |
Method* method = _methods->at(i); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
444 |
scan_method(method); |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
445 |
} |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
446 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
447 |
// allocate constant pool cache, now that we've seen all the bytecodes |
9971 | 448 |
make_constant_pool_cache(THREAD); |
449 |
||
450 |
// Restore bytecodes to their unrewritten state if there are exceptions |
|
451 |
// rewriting bytecodes or allocating the cpCache |
|
452 |
if (HAS_PENDING_EXCEPTION) { |
|
453 |
restore_bytecodes(); |
|
454 |
return; |
|
455 |
} |
|
456 |
} |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
457 |
|
9971 | 458 |
// Relocate jsr/rets in a method. This can't be done with the rewriter |
459 |
// stage because it can throw other exceptions, leaving the bytecodes |
|
460 |
// pointing at constant pool cache entries. |
|
461 |
// Link and check jvmti dependencies while we're iterating over the methods. |
|
462 |
// JSR292 code calls with a different set of methods, so two entry points. |
|
463 |
void Rewriter::relocate_and_link(instanceKlassHandle this_oop, TRAPS) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
464 |
relocate_and_link(this_oop, this_oop->methods(), THREAD); |
9971 | 465 |
} |
466 |
||
467 |
void Rewriter::relocate_and_link(instanceKlassHandle this_oop, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
468 |
Array<Method*>* methods, TRAPS) { |
9971 | 469 |
int len = methods->length(); |
470 |
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
|
471 |
methodHandle m(THREAD, methods->at(i)); |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
472 |
|
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
473 |
if (m->has_jsrs()) { |
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
474 |
m = rewrite_jsrs(m, CHECK); |
1 | 475 |
// Method might have gotten rewritten. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
476 |
methods->at_put(i, m()); |
1 | 477 |
} |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
478 |
|
9971 | 479 |
// Set up method entry points for compiler and interpreter . |
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2105
diff
changeset
|
480 |
m->link_method(m, CHECK); |
5697 | 481 |
|
9971 | 482 |
// This is for JVMTI and unrelated to relocator but the last thing we do |
5697 | 483 |
#ifdef ASSERT |
484 |
if (StressMethodComparator) { |
|
485 |
static int nmc = 0; |
|
486 |
for (int j = i; j >= 0 && j >= i-4; j--) { |
|
487 |
if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); |
|
9971 | 488 |
bool z = MethodComparator::methods_EMCP(m(), |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
489 |
methods->at(j)); |
5697 | 490 |
if (j == i && !z) { |
491 |
tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); |
|
492 |
assert(z, "method must compare equal to itself"); |
|
493 |
} |
|
494 |
} |
|
495 |
} |
|
496 |
#endif //ASSERT |
|
1 | 497 |
} |
498 |
} |