Mercurial > hg > graal-compiler
annotate src/share/vm/interpreter/rewriter.cpp @ 3272:01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
Summary: Handle stack overflow before the first frame is called, by printing out the called method and not walking the stack.
Reviewed-by: dholmes, phh, dsamersoff
author | coleenp |
---|---|
date | Tue, 26 Apr 2011 14:04:43 -0400 |
parents | ed69575596ac |
children | 0654ee04b214 2d4b2b833d29 |
rev | line source |
---|---|
0 | 1 /* |
2142 | 2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. |
0 | 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 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1138
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1138
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1138
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
26 #include "interpreter/bytecodes.hpp" | |
27 #include "interpreter/interpreter.hpp" | |
28 #include "interpreter/rewriter.hpp" | |
29 #include "memory/gcLocker.hpp" | |
30 #include "memory/oopFactory.hpp" | |
31 #include "memory/resourceArea.hpp" | |
32 #include "oops/generateOopMap.hpp" | |
33 #include "oops/objArrayOop.hpp" | |
34 #include "oops/oop.inline.hpp" | |
35 #include "prims/methodComparator.hpp" | |
0 | 36 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
37 // Computes a CPC map (new_index -> original_index) for constant pool entries |
0 | 38 // that are referred to by the interpreter at runtime via the constant pool cache. |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
39 // Also computes a CP map (original_index -> new_index). |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
40 // Marks entries in CP which require additional processing. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
41 void Rewriter::compute_index_maps() { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
42 const int length = _pool->length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
43 init_cp_map(length); |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
44 jint tag_mask = 0; |
0 | 45 for (int i = 0; i < length; i++) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
46 int tag = _pool->tag_at(i).value(); |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
47 tag_mask |= (1 << tag); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
48 switch (tag) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
49 case JVM_CONSTANT_InterfaceMethodref: |
0 | 50 case JVM_CONSTANT_Fieldref : // fall through |
51 case JVM_CONSTANT_Methodref : // fall through | |
1602 | 52 case JVM_CONSTANT_MethodHandle : // fall through |
53 case JVM_CONSTANT_MethodType : // fall through | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
54 case JVM_CONSTANT_InvokeDynamic : // fall through |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
55 add_cp_cache_entry(i); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
56 break; |
0 | 57 } |
58 } | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
59 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
60 guarantee((int)_cp_cache_map.length()-1 <= (int)((u2)-1), |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
61 "all cp cache indexes fit in a u2"); |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
62 |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
63 _have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0); |
0 | 64 } |
65 | |
66 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
67 // Creates a constant pool cache given a CPC map |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
68 void Rewriter::make_constant_pool_cache(TRAPS) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
69 const int length = _cp_cache_map.length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
70 constantPoolCacheOop cache = |
2226
c5a923563727
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
2142
diff
changeset
|
71 oopFactory::new_constantPoolCache(length, CHECK); |
c5a923563727
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
2142
diff
changeset
|
72 No_Safepoint_Verifier nsv; |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
73 cache->initialize(_cp_cache_map); |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
74 |
2011
dad31fc330cd
7001379: bootstrap method data needs to be moved from constant pool to a classfile attribute
jrose
parents:
1972
diff
changeset
|
75 // Don't bother with the next pass if there is no JVM_CONSTANT_InvokeDynamic. |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
76 if (_have_invoke_dynamic) { |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
77 for (int i = 0; i < length; i++) { |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
78 int pool_index = cp_cache_entry_pool_index(i); |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
79 if (pool_index >= 0 && |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
80 _pool->tag_at(pool_index).is_invoke_dynamic()) { |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
81 int bsm_index = _pool->invoke_dynamic_bootstrap_method_ref_index_at(pool_index); |
2460 | 82 assert(_pool->tag_at(bsm_index).is_method_handle(), "must be a MH constant"); |
83 // There is a CP cache entry holding the BSM for these calls. | |
84 int bsm_cache_index = cp_entry_to_cp_cache(bsm_index); | |
85 cache->entry_at(i)->initialize_bootstrap_method_index_in_cache(bsm_cache_index); | |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
86 } |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
87 } |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
88 } |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
89 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
90 _pool->set_cache(cache); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
91 cache->set_constant_pool(_pool()); |
0 | 92 } |
93 | |
94 | |
95 | |
96 // The new finalization semantics says that registration of | |
97 // finalizable objects must be performed on successful return from the | |
98 // Object.<init> constructor. We could implement this trivially if | |
99 // <init> were never rewritten but since JVMTI allows this to occur, a | |
100 // more complicated solution is required. A special return bytecode | |
101 // is used only by Object.<init> to signal the finalization | |
102 // registration point. Additionally local 0 must be preserved so it's | |
103 // available to pass to the registration function. For simplicty we | |
104 // require that local 0 is never overwritten so it's available as an | |
105 // argument for registration. | |
106 | |
107 void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) { | |
108 RawBytecodeStream bcs(method); | |
109 while (!bcs.is_last_bytecode()) { | |
110 Bytecodes::Code opcode = bcs.raw_next(); | |
111 switch (opcode) { | |
112 case Bytecodes::_return: *bcs.bcp() = Bytecodes::_return_register_finalizer; break; | |
113 | |
114 case Bytecodes::_istore: | |
115 case Bytecodes::_lstore: | |
116 case Bytecodes::_fstore: | |
117 case Bytecodes::_dstore: | |
118 case Bytecodes::_astore: | |
119 if (bcs.get_index() != 0) continue; | |
120 | |
121 // fall through | |
122 case Bytecodes::_istore_0: | |
123 case Bytecodes::_lstore_0: | |
124 case Bytecodes::_fstore_0: | |
125 case Bytecodes::_dstore_0: | |
126 case Bytecodes::_astore_0: | |
127 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), | |
128 "can't overwrite local 0 in Object.<init>"); | |
129 break; | |
130 } | |
131 } | |
132 } | |
133 | |
134 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
135 // Rewrite a classfile-order CP index into a native-order CPC index. |
1565 | 136 void Rewriter::rewrite_member_reference(address bcp, int offset) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
137 address p = bcp + offset; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
138 int cp_index = Bytes::get_Java_u2(p); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
139 int cache_index = cp_entry_to_cp_cache(cp_index); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
140 Bytes::put_native_u2(p, cache_index); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
141 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
142 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
143 |
1565 | 144 void Rewriter::rewrite_invokedynamic(address bcp, int offset) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
145 address p = bcp + offset; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
146 assert(p[-1] == Bytecodes::_invokedynamic, ""); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
147 int cp_index = Bytes::get_Java_u2(p); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
148 int cpc = maybe_add_cp_cache_entry(cp_index); // add lazily |
1059
389049f3f393
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
856
diff
changeset
|
149 int cpc2 = add_secondary_cp_cache_entry(cpc); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
150 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
151 // Replace the trailing four bytes with a CPC index for the dynamic |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
152 // call site. Unlike other CPC entries, there is one per bytecode, |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
153 // not just one per distinct CP entry. In other words, the |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
154 // CPC-to-CP relation is many-to-one for invokedynamic entries. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
155 // This means we must use a larger index size than u2 to address |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
156 // all these entries. That is the main reason invokedynamic |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
157 // must have a five-byte instruction format. (Of course, other JVM |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
158 // implementations can use the bytes for other purposes.) |
1059
389049f3f393
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
856
diff
changeset
|
159 Bytes::put_native_u4(p, constantPoolCacheOopDesc::encode_secondary_index(cpc2)); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
160 // Note: We use native_u4 format exclusively for 4-byte indexes. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
161 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
162 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
163 |
1602 | 164 // Rewrite some ldc bytecodes to _fast_aldc |
165 void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide) { | |
166 assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), ""); | |
167 address p = bcp + offset; | |
168 int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p); | |
169 constantTag tag = _pool->tag_at(cp_index).value(); | |
170 if (tag.is_method_handle() || tag.is_method_type()) { | |
171 int cache_index = cp_entry_to_cp_cache(cp_index); | |
172 if (is_wide) { | |
173 (*bcp) = Bytecodes::_fast_aldc_w; | |
174 assert(cache_index == (u2)cache_index, ""); | |
175 Bytes::put_native_u2(p, cache_index); | |
176 } else { | |
177 (*bcp) = Bytecodes::_fast_aldc; | |
178 assert(cache_index == (u1)cache_index, ""); | |
179 (*p) = (u1)cache_index; | |
180 } | |
181 } | |
182 } | |
183 | |
184 | |
0 | 185 // Rewrites a method given the index_map information |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
186 void Rewriter::scan_method(methodOop method) { |
0 | 187 |
188 int nof_jsrs = 0; | |
189 bool has_monitor_bytecodes = false; | |
190 | |
191 { | |
192 // We cannot tolerate a GC in this block, because we've | |
193 // cached the bytecodes in 'code_base'. If the methodOop | |
194 // moves, the bytecodes will also move. | |
195 No_Safepoint_Verifier nsv; | |
196 Bytecodes::Code c; | |
197 | |
198 // Bytecodes and their length | |
199 const address code_base = method->code_base(); | |
200 const int code_length = method->code_size(); | |
201 | |
202 int bc_length; | |
203 for (int bci = 0; bci < code_length; bci += bc_length) { | |
204 address bcp = code_base + bci; | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
205 int prefix_length = 0; |
0 | 206 c = (Bytecodes::Code)(*bcp); |
207 | |
208 // Since we have the code, see if we can get the length | |
209 // directly. Some more complicated bytecodes will report | |
210 // a length of zero, meaning we need to make another method | |
211 // call to calculate the length. | |
212 bc_length = Bytecodes::length_for(c); | |
213 if (bc_length == 0) { | |
2142 | 214 bc_length = Bytecodes::length_at(method, bcp); |
0 | 215 |
216 // length_at will put us at the bytecode after the one modified | |
217 // by 'wide'. We don't currently examine any of the bytecodes | |
218 // modified by wide, but in case we do in the future... | |
219 if (c == Bytecodes::_wide) { | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
220 prefix_length = 1; |
0 | 221 c = (Bytecodes::Code)bcp[1]; |
222 } | |
223 } | |
224 | |
225 assert(bc_length != 0, "impossible bytecode length"); | |
226 | |
227 switch (c) { | |
228 case Bytecodes::_lookupswitch : { | |
229 #ifndef CC_INTERP | |
2142 | 230 Bytecode_lookupswitch bc(method, bcp); |
1565 | 231 (*bcp) = ( |
2142 | 232 bc.number_of_pairs() < BinarySwitchThreshold |
0 | 233 ? Bytecodes::_fast_linearswitch |
234 : Bytecodes::_fast_binaryswitch | |
235 ); | |
236 #endif | |
237 break; | |
238 } | |
239 case Bytecodes::_getstatic : // fall through | |
240 case Bytecodes::_putstatic : // fall through | |
241 case Bytecodes::_getfield : // fall through | |
242 case Bytecodes::_putfield : // fall through | |
243 case Bytecodes::_invokevirtual : // fall through | |
244 case Bytecodes::_invokespecial : // fall through | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
245 case Bytecodes::_invokestatic : |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
246 case Bytecodes::_invokeinterface: |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
247 rewrite_member_reference(bcp, prefix_length+1); |
0 | 248 break; |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
249 case Bytecodes::_invokedynamic: |
1565 | 250 rewrite_invokedynamic(bcp, prefix_length+1); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
251 break; |
1602 | 252 case Bytecodes::_ldc: |
253 maybe_rewrite_ldc(bcp, prefix_length+1, false); | |
254 break; | |
255 case Bytecodes::_ldc_w: | |
256 maybe_rewrite_ldc(bcp, prefix_length+1, true); | |
257 break; | |
0 | 258 case Bytecodes::_jsr : // fall through |
259 case Bytecodes::_jsr_w : nof_jsrs++; break; | |
260 case Bytecodes::_monitorenter : // fall through | |
261 case Bytecodes::_monitorexit : has_monitor_bytecodes = true; break; | |
262 } | |
263 } | |
264 } | |
265 | |
266 // Update access flags | |
267 if (has_monitor_bytecodes) { | |
268 method->set_has_monitor_bytecodes(); | |
269 } | |
270 | |
271 // The present of a jsr bytecode implies that the method might potentially | |
272 // have to be rewritten, so we run the oopMapGenerator on the method | |
273 if (nof_jsrs > 0) { | |
274 method->set_has_jsrs(); | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
275 // Second pass will revisit this method. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
276 assert(method->has_jsrs(), ""); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
277 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
278 } |
0 | 279 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
280 // After constant pool is created, revisit methods containing jsrs. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
281 methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
282 ResolveOopMapConflicts romc(method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
283 methodHandle original_method = method; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
284 method = romc.do_potential_rewrite(CHECK_(methodHandle())); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
285 if (method() != original_method()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
286 // Insert invalid bytecode into original methodOop and set |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
287 // interpreter entrypoint, so that a executing this method |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
288 // will manifest itself in an easy recognizable form. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
289 address bcp = original_method->bcp_from(0); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
290 *bcp = (u1)Bytecodes::_shouldnotreachhere; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
291 int kind = Interpreter::method_kind(original_method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
292 original_method->set_interpreter_kind(kind); |
0 | 293 } |
294 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
295 // Update monitor matching info. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
296 if (romc.monitor_safe()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
297 method->set_guaranteed_monitor_matching(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
298 } |
0 | 299 |
300 return method; | |
301 } | |
302 | |
303 | |
304 void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) { | |
305 ResourceMark rm(THREAD); | |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
306 Rewriter rw(klass, klass->constants(), klass->methods(), CHECK); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
307 // (That's all, folks.) |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
308 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
309 |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
310 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
311 void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) { |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
312 ResourceMark rm(THREAD); |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
313 Rewriter rw(klass, cpool, methods, CHECK); |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
314 // (That's all, folks.) |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
315 } |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
316 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
317 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
318 Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
319 : _klass(klass), |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
320 _pool(cpool), |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
321 _methods(methods) |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
322 { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
323 assert(_pool->cache() == NULL, "constant pool cache must not be set yet"); |
0 | 324 |
325 // determine index maps for methodOop rewriting | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
326 compute_index_maps(); |
0 | 327 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
328 if (RegisterFinalizersAtInit && _klass->name() == vmSymbols::java_lang_Object()) { |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
726
diff
changeset
|
329 bool did_rewrite = false; |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
330 int i = _methods->length(); |
0 | 331 while (i-- > 0) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
332 methodOop method = (methodOop)_methods->obj_at(i); |
0 | 333 if (method->intrinsic_id() == vmIntrinsics::_Object_init) { |
334 // rewrite the return bytecodes of Object.<init> to register the | |
335 // object for finalization if needed. | |
336 methodHandle m(THREAD, method); | |
337 rewrite_Object_init(m, CHECK); | |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
726
diff
changeset
|
338 did_rewrite = true; |
0 | 339 break; |
340 } | |
341 } | |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
726
diff
changeset
|
342 assert(did_rewrite, "must find Object::<init> to rewrite it"); |
0 | 343 } |
344 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
345 // rewrite methods, in two passes |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
346 int i, len = _methods->length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
347 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
348 for (i = len; --i >= 0; ) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
349 methodOop method = (methodOop)_methods->obj_at(i); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
350 scan_method(method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
351 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
352 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
353 // allocate constant pool cache, now that we've seen all the bytecodes |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
354 make_constant_pool_cache(CHECK); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
355 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
356 for (i = len; --i >= 0; ) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
357 methodHandle m(THREAD, (methodOop)_methods->obj_at(i)); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
358 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
359 if (m->has_jsrs()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
360 m = rewrite_jsrs(m, CHECK); |
0 | 361 // Method might have gotten rewritten. |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
362 _methods->obj_at_put(i, m()); |
0 | 363 } |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
364 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
365 // Set up method entry points for compiler and interpreter. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
366 m->link_method(m, CHECK); |
1574 | 367 |
368 #ifdef ASSERT | |
369 if (StressMethodComparator) { | |
370 static int nmc = 0; | |
371 for (int j = i; j >= 0 && j >= i-4; j--) { | |
372 if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); | |
373 bool z = MethodComparator::methods_EMCP(m(), (methodOop)_methods->obj_at(j)); | |
374 if (j == i && !z) { | |
375 tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); | |
376 assert(z, "method must compare equal to itself"); | |
377 } | |
378 } | |
379 } | |
380 #endif //ASSERT | |
0 | 381 } |
382 } |