Mercurial > hg > truffle
annotate src/share/vm/interpreter/rewriter.cpp @ 1604:b918d354830a
6960865: ldc of unloaded class throws an assert in ciTypeFlow
Summary: Support java_mirror for unloaded klasses, arrays as well as instances. Simplify ciTypeFlow by removing unused path.
Reviewed-by: kvn
author | jrose |
---|---|
date | Sat, 12 Jun 2010 22:53:43 -0700 |
parents | 136b78722a08 |
children | 083fde3b838e |
rev | line source |
---|---|
0 | 1 /* |
1579 | 2 * Copyright (c) 1998, 2010, 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 | |
25 # include "incls/_precompiled.incl" | |
26 # include "incls/_rewriter.cpp.incl" | |
27 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
28 // Computes a CPC map (new_index -> original_index) for constant pool entries |
0 | 29 // 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
|
30 // Also computes a CP map (original_index -> new_index). |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
31 // Marks entries in CP which require additional processing. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
32 void Rewriter::compute_index_maps() { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
33 const int length = _pool->length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
34 init_cp_map(length); |
0 | 35 for (int i = 0; i < length; i++) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
36 int tag = _pool->tag_at(i).value(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
37 switch (tag) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
38 case JVM_CONSTANT_InterfaceMethodref: |
0 | 39 case JVM_CONSTANT_Fieldref : // fall through |
40 case JVM_CONSTANT_Methodref : // fall through | |
1602 | 41 case JVM_CONSTANT_MethodHandle : // fall through |
42 case JVM_CONSTANT_MethodType : // fall through | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
43 add_cp_cache_entry(i); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
44 break; |
0 | 45 } |
46 } | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
47 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
48 guarantee((int)_cp_cache_map.length()-1 <= (int)((u2)-1), |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
49 "all cp cache indexes fit in a u2"); |
0 | 50 } |
51 | |
52 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
53 // Creates a constant pool cache given a CPC map |
542
9a25e0c45327
6792421: assert(_bitMap->isMarked(addr+size-1),inconsistent Printezis mark)
jmasa
parents:
0
diff
changeset
|
54 // This creates the constant pool cache initially in a state |
9a25e0c45327
6792421: assert(_bitMap->isMarked(addr+size-1),inconsistent Printezis mark)
jmasa
parents:
0
diff
changeset
|
55 // that is unsafe for concurrent GC processing but sets it to |
9a25e0c45327
6792421: assert(_bitMap->isMarked(addr+size-1),inconsistent Printezis mark)
jmasa
parents:
0
diff
changeset
|
56 // a safe mode before the constant pool cache is returned. |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
57 void Rewriter::make_constant_pool_cache(TRAPS) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
58 const int length = _cp_cache_map.length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
59 constantPoolCacheOop cache = |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
60 oopFactory::new_constantPoolCache(length, methodOopDesc::IsUnsafeConc, CHECK); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
61 cache->initialize(_cp_cache_map); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
62 _pool->set_cache(cache); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
63 cache->set_constant_pool(_pool()); |
0 | 64 } |
65 | |
66 | |
67 | |
68 // The new finalization semantics says that registration of | |
69 // finalizable objects must be performed on successful return from the | |
70 // Object.<init> constructor. We could implement this trivially if | |
71 // <init> were never rewritten but since JVMTI allows this to occur, a | |
72 // more complicated solution is required. A special return bytecode | |
73 // is used only by Object.<init> to signal the finalization | |
74 // registration point. Additionally local 0 must be preserved so it's | |
75 // available to pass to the registration function. For simplicty we | |
76 // require that local 0 is never overwritten so it's available as an | |
77 // argument for registration. | |
78 | |
79 void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) { | |
80 RawBytecodeStream bcs(method); | |
81 while (!bcs.is_last_bytecode()) { | |
82 Bytecodes::Code opcode = bcs.raw_next(); | |
83 switch (opcode) { | |
84 case Bytecodes::_return: *bcs.bcp() = Bytecodes::_return_register_finalizer; break; | |
85 | |
86 case Bytecodes::_istore: | |
87 case Bytecodes::_lstore: | |
88 case Bytecodes::_fstore: | |
89 case Bytecodes::_dstore: | |
90 case Bytecodes::_astore: | |
91 if (bcs.get_index() != 0) continue; | |
92 | |
93 // fall through | |
94 case Bytecodes::_istore_0: | |
95 case Bytecodes::_lstore_0: | |
96 case Bytecodes::_fstore_0: | |
97 case Bytecodes::_dstore_0: | |
98 case Bytecodes::_astore_0: | |
99 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), | |
100 "can't overwrite local 0 in Object.<init>"); | |
101 break; | |
102 } | |
103 } | |
104 } | |
105 | |
106 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
107 // Rewrite a classfile-order CP index into a native-order CPC index. |
1565 | 108 void Rewriter::rewrite_member_reference(address bcp, int offset) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
109 address p = bcp + offset; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
110 int cp_index = Bytes::get_Java_u2(p); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
111 int cache_index = cp_entry_to_cp_cache(cp_index); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
112 Bytes::put_native_u2(p, cache_index); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
113 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
114 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
115 |
1565 | 116 void Rewriter::rewrite_invokedynamic(address bcp, int offset) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
117 address p = bcp + offset; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
118 assert(p[-1] == Bytecodes::_invokedynamic, ""); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
119 int cp_index = Bytes::get_Java_u2(p); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
120 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
|
121 int cpc2 = add_secondary_cp_cache_entry(cpc); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
122 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
123 // 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
|
124 // 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
|
125 // 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
|
126 // 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
|
127 // 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
|
128 // all these entries. That is the main reason invokedynamic |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
129 // 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
|
130 // implementations can use the bytes for other purposes.) |
1059
389049f3f393
6858164: invokedynamic code needs some cleanup (post-6655638)
jrose
parents:
856
diff
changeset
|
131 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
|
132 // 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
|
133 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
134 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
135 |
1602 | 136 // Rewrite some ldc bytecodes to _fast_aldc |
137 void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide) { | |
138 assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), ""); | |
139 address p = bcp + offset; | |
140 int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p); | |
141 constantTag tag = _pool->tag_at(cp_index).value(); | |
142 if (tag.is_method_handle() || tag.is_method_type()) { | |
143 int cache_index = cp_entry_to_cp_cache(cp_index); | |
144 if (is_wide) { | |
145 (*bcp) = Bytecodes::_fast_aldc_w; | |
146 assert(cache_index == (u2)cache_index, ""); | |
147 Bytes::put_native_u2(p, cache_index); | |
148 } else { | |
149 (*bcp) = Bytecodes::_fast_aldc; | |
150 assert(cache_index == (u1)cache_index, ""); | |
151 (*p) = (u1)cache_index; | |
152 } | |
153 } | |
154 } | |
155 | |
156 | |
0 | 157 // Rewrites a method given the index_map information |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
158 void Rewriter::scan_method(methodOop method) { |
0 | 159 |
160 int nof_jsrs = 0; | |
161 bool has_monitor_bytecodes = false; | |
162 | |
163 { | |
164 // We cannot tolerate a GC in this block, because we've | |
165 // cached the bytecodes in 'code_base'. If the methodOop | |
166 // moves, the bytecodes will also move. | |
167 No_Safepoint_Verifier nsv; | |
168 Bytecodes::Code c; | |
169 | |
170 // Bytecodes and their length | |
171 const address code_base = method->code_base(); | |
172 const int code_length = method->code_size(); | |
173 | |
174 int bc_length; | |
175 for (int bci = 0; bci < code_length; bci += bc_length) { | |
176 address bcp = code_base + bci; | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
177 int prefix_length = 0; |
0 | 178 c = (Bytecodes::Code)(*bcp); |
179 | |
180 // Since we have the code, see if we can get the length | |
181 // directly. Some more complicated bytecodes will report | |
182 // a length of zero, meaning we need to make another method | |
183 // call to calculate the length. | |
184 bc_length = Bytecodes::length_for(c); | |
185 if (bc_length == 0) { | |
186 bc_length = Bytecodes::length_at(bcp); | |
187 | |
188 // length_at will put us at the bytecode after the one modified | |
189 // by 'wide'. We don't currently examine any of the bytecodes | |
190 // modified by wide, but in case we do in the future... | |
191 if (c == Bytecodes::_wide) { | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
192 prefix_length = 1; |
0 | 193 c = (Bytecodes::Code)bcp[1]; |
194 } | |
195 } | |
196 | |
197 assert(bc_length != 0, "impossible bytecode length"); | |
198 | |
199 switch (c) { | |
200 case Bytecodes::_lookupswitch : { | |
201 #ifndef CC_INTERP | |
202 Bytecode_lookupswitch* bc = Bytecode_lookupswitch_at(bcp); | |
1565 | 203 (*bcp) = ( |
0 | 204 bc->number_of_pairs() < BinarySwitchThreshold |
205 ? Bytecodes::_fast_linearswitch | |
206 : Bytecodes::_fast_binaryswitch | |
207 ); | |
208 #endif | |
209 break; | |
210 } | |
211 case Bytecodes::_getstatic : // fall through | |
212 case Bytecodes::_putstatic : // fall through | |
213 case Bytecodes::_getfield : // fall through | |
214 case Bytecodes::_putfield : // fall through | |
215 case Bytecodes::_invokevirtual : // fall through | |
216 case Bytecodes::_invokespecial : // fall through | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
217 case Bytecodes::_invokestatic : |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
218 case Bytecodes::_invokeinterface: |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
219 rewrite_member_reference(bcp, prefix_length+1); |
0 | 220 break; |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
221 case Bytecodes::_invokedynamic: |
1565 | 222 rewrite_invokedynamic(bcp, prefix_length+1); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
223 break; |
1602 | 224 case Bytecodes::_ldc: |
225 maybe_rewrite_ldc(bcp, prefix_length+1, false); | |
226 break; | |
227 case Bytecodes::_ldc_w: | |
228 maybe_rewrite_ldc(bcp, prefix_length+1, true); | |
229 break; | |
0 | 230 case Bytecodes::_jsr : // fall through |
231 case Bytecodes::_jsr_w : nof_jsrs++; break; | |
232 case Bytecodes::_monitorenter : // fall through | |
233 case Bytecodes::_monitorexit : has_monitor_bytecodes = true; break; | |
234 } | |
235 } | |
236 } | |
237 | |
238 // Update access flags | |
239 if (has_monitor_bytecodes) { | |
240 method->set_has_monitor_bytecodes(); | |
241 } | |
242 | |
243 // The present of a jsr bytecode implies that the method might potentially | |
244 // have to be rewritten, so we run the oopMapGenerator on the method | |
245 if (nof_jsrs > 0) { | |
246 method->set_has_jsrs(); | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
247 // Second pass will revisit this method. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
248 assert(method->has_jsrs(), ""); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
249 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
250 } |
0 | 251 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
252 // After constant pool is created, revisit methods containing jsrs. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
253 methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
254 ResolveOopMapConflicts romc(method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
255 methodHandle original_method = method; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
256 method = romc.do_potential_rewrite(CHECK_(methodHandle())); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
257 if (method() != original_method()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
258 // Insert invalid bytecode into original methodOop and set |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
259 // interpreter entrypoint, so that a executing this method |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
260 // will manifest itself in an easy recognizable form. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
261 address bcp = original_method->bcp_from(0); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
262 *bcp = (u1)Bytecodes::_shouldnotreachhere; |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
263 int kind = Interpreter::method_kind(original_method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
264 original_method->set_interpreter_kind(kind); |
0 | 265 } |
266 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
267 // Update monitor matching info. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
268 if (romc.monitor_safe()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
269 method->set_guaranteed_monitor_matching(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
270 } |
0 | 271 |
272 return method; | |
273 } | |
274 | |
275 | |
276 void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) { | |
277 ResourceMark rm(THREAD); | |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
278 Rewriter rw(klass, klass->constants(), klass->methods(), CHECK); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
279 // (That's all, folks.) |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
280 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
281 |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
282 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
283 void Rewriter::rewrite(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) { |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
284 ResourceMark rm(THREAD); |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
285 Rewriter rw(klass, cpool, methods, CHECK); |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
286 // (That's all, folks.) |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
287 } |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
288 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
289 |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
290 Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArrayHandle methods, TRAPS) |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
291 : _klass(klass), |
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
292 _pool(cpool), |
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
293 _methods(methods) |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
294 { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
295 assert(_pool->cache() == NULL, "constant pool cache must not be set yet"); |
0 | 296 |
297 // determine index maps for methodOop rewriting | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
298 compute_index_maps(); |
0 | 299 |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
300 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
|
301 bool did_rewrite = false; |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
302 int i = _methods->length(); |
0 | 303 while (i-- > 0) { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
304 methodOop method = (methodOop)_methods->obj_at(i); |
0 | 305 if (method->intrinsic_id() == vmIntrinsics::_Object_init) { |
306 // rewrite the return bytecodes of Object.<init> to register the | |
307 // object for finalization if needed. | |
308 methodHandle m(THREAD, method); | |
309 rewrite_Object_init(m, CHECK); | |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
726
diff
changeset
|
310 did_rewrite = true; |
0 | 311 break; |
312 } | |
313 } | |
856
75596850f863
6862576: vmIntrinsics needs cleanup in order to support JSR 292 intrinsics
jrose
parents:
726
diff
changeset
|
314 assert(did_rewrite, "must find Object::<init> to rewrite it"); |
0 | 315 } |
316 | |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
317 // rewrite methods, in two passes |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
318 int i, len = _methods->length(); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
319 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
320 for (i = len; --i >= 0; ) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
321 methodOop method = (methodOop)_methods->obj_at(i); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
322 scan_method(method); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
323 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
324 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
325 // 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
|
326 make_constant_pool_cache(CHECK); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
327 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
328 for (i = len; --i >= 0; ) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
329 methodHandle m(THREAD, (methodOop)_methods->obj_at(i)); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
330 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
331 if (m->has_jsrs()) { |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
332 m = rewrite_jsrs(m, CHECK); |
0 | 333 // Method might have gotten rewritten. |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
334 _methods->obj_at_put(i, m()); |
0 | 335 } |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
336 |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
337 // Set up method entry points for compiler and interpreter. |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
579
diff
changeset
|
338 m->link_method(m, CHECK); |
1574 | 339 |
340 #ifdef ASSERT | |
341 if (StressMethodComparator) { | |
342 static int nmc = 0; | |
343 for (int j = i; j >= 0 && j >= i-4; j--) { | |
344 if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); | |
345 bool z = MethodComparator::methods_EMCP(m(), (methodOop)_methods->obj_at(j)); | |
346 if (j == i && !z) { | |
347 tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); | |
348 assert(z, "method must compare equal to itself"); | |
349 } | |
350 } | |
351 } | |
352 #endif //ASSERT | |
0 | 353 } |
354 } |