Print this page
rev 6869 : 8057043: Type annotations not retained during class redefine / retransform
Reviewed-by: coleenp, sspitsyn, jfranck
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
+++ new/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
1 1 /*
2 2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #include "precompiled.hpp"
26 26 #include "classfile/symbolTable.hpp"
27 27 #include "interpreter/bytecodeStream.hpp"
28 28 #include "oops/fieldStreams.hpp"
29 29 #include "prims/jvmtiClassFileReconstituter.hpp"
30 30 #include "runtime/signature.hpp"
31 31 #ifdef TARGET_ARCH_x86
32 32 # include "bytes_x86.hpp"
33 33 #endif
34 34 #ifdef TARGET_ARCH_sparc
35 35 # include "bytes_sparc.hpp"
36 36 #endif
37 37 #ifdef TARGET_ARCH_zero
38 38 # include "bytes_zero.hpp"
39 39 #endif
40 40 #ifdef TARGET_ARCH_arm
41 41 # include "bytes_arm.hpp"
42 42 #endif
43 43 #ifdef TARGET_ARCH_ppc
44 44 # include "bytes_ppc.hpp"
45 45 #endif
46 46 // FIXME: add Deprecated attribute
|
↓ open down ↓ |
46 lines elided |
↑ open up ↑ |
47 47 // FIXME: fix Synthetic attribute
48 48 // FIXME: per Serguei, add error return handling for ConstantPool::copy_cpool_bytes()
49 49
50 50
51 51 // Write the field information portion of ClassFile structure
52 52 // JVMSpec| u2 fields_count;
53 53 // JVMSpec| field_info fields[fields_count];
54 54 void JvmtiClassFileReconstituter::write_field_infos() {
55 55 HandleMark hm(thread());
56 56 Array<AnnotationArray*>* fields_anno = ikh()->fields_annotations();
57 + Array<AnnotationArray*>* fields_type_anno = ikh()->fields_type_annotations();
57 58
58 59 // Compute the real number of Java fields
59 60 int java_fields = ikh()->java_fields_count();
60 61
61 62 write_u2(java_fields);
62 63 for (JavaFieldStream fs(ikh()); !fs.done(); fs.next()) {
63 64 AccessFlags access_flags = fs.access_flags();
64 65 int name_index = fs.name_index();
65 66 int signature_index = fs.signature_index();
66 67 int initial_value_index = fs.initval_index();
67 68 guarantee(name_index != 0 && signature_index != 0, "bad constant pool index for field");
68 69 // int offset = ikh()->field_offset( index );
69 70 int generic_signature_index = fs.generic_signature_index();
70 71 AnnotationArray* anno = fields_anno == NULL ? NULL : fields_anno->at(fs.index());
72 + AnnotationArray* type_anno = fields_type_anno == NULL ? NULL : fields_type_anno->at(fs.index());
71 73
72 74 // JVMSpec| field_info {
73 75 // JVMSpec| u2 access_flags;
74 76 // JVMSpec| u2 name_index;
75 77 // JVMSpec| u2 descriptor_index;
76 78 // JVMSpec| u2 attributes_count;
77 79 // JVMSpec| attribute_info attributes[attributes_count];
78 80 // JVMSpec| }
79 81
80 82 write_u2(access_flags.as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS);
81 83 write_u2(name_index);
82 84 write_u2(signature_index);
83 85 int attr_count = 0;
84 86 if (initial_value_index != 0) {
85 87 ++attr_count;
|
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
86 88 }
87 89 if (access_flags.is_synthetic()) {
88 90 // ++attr_count;
89 91 }
90 92 if (generic_signature_index != 0) {
91 93 ++attr_count;
92 94 }
93 95 if (anno != NULL) {
94 96 ++attr_count; // has RuntimeVisibleAnnotations attribute
95 97 }
98 + if (type_anno != NULL) {
99 + ++attr_count; // has RuntimeVisibleTypeAnnotations attribute
100 + }
96 101
97 102 write_u2(attr_count);
98 103
99 104 if (initial_value_index != 0) {
100 105 write_attribute_name_index("ConstantValue");
101 106 write_u4(2); //length always 2
102 107 write_u2(initial_value_index);
103 108 }
104 109 if (access_flags.is_synthetic()) {
105 110 // write_synthetic_attribute();
106 111 }
107 112 if (generic_signature_index != 0) {
108 113 write_signature_attribute(generic_signature_index);
109 114 }
110 115 if (anno != NULL) {
111 116 write_annotations_attribute("RuntimeVisibleAnnotations", anno);
112 117 }
118 + if (type_anno != NULL) {
119 + write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
120 + }
113 121 }
114 122 }
115 123
116 124 // Write Code attribute
117 125 // JVMSpec| Code_attribute {
118 126 // JVMSpec| u2 attribute_name_index;
119 127 // JVMSpec| u4 attribute_length;
120 128 // JVMSpec| u2 max_stack;
121 129 // JVMSpec| u2 max_locals;
122 130 // JVMSpec| u4 code_length;
123 131 // JVMSpec| u1 code[code_length];
124 132 // JVMSpec| u2 exception_table_length;
125 133 // JVMSpec| { u2 start_pc;
126 134 // JVMSpec| u2 end_pc;
127 135 // JVMSpec| u2 handler_pc;
128 136 // JVMSpec| u2 catch_type;
129 137 // JVMSpec| } exception_table[exception_table_length];
130 138 // JVMSpec| u2 attributes_count;
131 139 // JVMSpec| attribute_info attributes[attributes_count];
132 140 // JVMSpec| }
133 141 void JvmtiClassFileReconstituter::write_code_attribute(methodHandle method) {
134 142 ConstMethod* const_method = method->constMethod();
135 143 u2 line_num_cnt = 0;
136 144 int stackmap_len = 0;
137 145 int local_variable_table_length = 0;
138 146 int local_variable_type_table_length = 0;
139 147
140 148 // compute number and length of attributes
141 149 int attr_count = 0;
142 150 int attr_size = 0;
143 151 if (const_method->has_linenumber_table()) {
144 152 line_num_cnt = line_number_table_entries(method);
145 153 if (line_num_cnt != 0) {
146 154 ++attr_count;
147 155 // Compute the complete size of the line number table attribute:
148 156 // LineNumberTable_attribute {
149 157 // u2 attribute_name_index;
150 158 // u4 attribute_length;
151 159 // u2 line_number_table_length;
152 160 // { u2 start_pc;
153 161 // u2 line_number;
154 162 // } line_number_table[line_number_table_length];
155 163 // }
156 164 attr_size += 2 + 4 + 2 + line_num_cnt * (2 + 2);
157 165 }
158 166 }
159 167 if (method->has_stackmap_table()) {
160 168 stackmap_len = method->stackmap_data()->length();
161 169 if (stackmap_len != 0) {
162 170 ++attr_count;
163 171 // Compute the size of the stack map table attribute (VM stores raw):
164 172 // StackMapTable_attribute {
165 173 // u2 attribute_name_index;
166 174 // u4 attribute_length;
167 175 // u2 number_of_entries;
168 176 // stack_map_frame_entries[number_of_entries];
169 177 // }
170 178 attr_size += 2 + 4 + stackmap_len;
171 179 }
172 180 }
173 181 if (method->has_localvariable_table()) {
174 182 local_variable_table_length = method->localvariable_table_length();
175 183 if (local_variable_table_length != 0) {
176 184 ++attr_count;
177 185 // Compute the size of the local variable table attribute (VM stores raw):
178 186 // LocalVariableTable_attribute {
179 187 // u2 attribute_name_index;
180 188 // u4 attribute_length;
181 189 // u2 local_variable_table_length;
182 190 // {
183 191 // u2 start_pc;
184 192 // u2 length;
185 193 // u2 name_index;
186 194 // u2 descriptor_index;
187 195 // u2 index;
188 196 // }
189 197 attr_size += 2 + 4 + 2 + local_variable_table_length * (2 + 2 + 2 + 2 + 2);
190 198
191 199 // Local variables with generic signatures must have LVTT entries
192 200 LocalVariableTableElement *elem = method->localvariable_table_start();
193 201 for (int idx = 0; idx < local_variable_table_length; idx++) {
194 202 if (elem[idx].signature_cp_index != 0) {
195 203 local_variable_type_table_length++;
196 204 }
197 205 }
198 206
199 207 if (local_variable_type_table_length != 0) {
200 208 ++attr_count;
201 209 // Compute the size of the local variable type table attribute (VM stores raw):
202 210 // LocalVariableTypeTable_attribute {
203 211 // u2 attribute_name_index;
204 212 // u4 attribute_length;
205 213 // u2 local_variable_type_table_length;
206 214 // {
207 215 // u2 start_pc;
208 216 // u2 length;
209 217 // u2 name_index;
210 218 // u2 signature_index;
211 219 // u2 index;
212 220 // }
213 221 attr_size += 2 + 4 + 2 + local_variable_type_table_length * (2 + 2 + 2 + 2 + 2);
214 222 }
215 223 }
216 224 }
217 225
218 226 ExceptionTable exception_table(method());
219 227 int exception_table_length = exception_table.length();
220 228 int code_size = const_method->code_size();
221 229 int size =
222 230 2+2+4 + // max_stack, max_locals, code_length
223 231 code_size + // code
224 232 2 + // exception_table_length
225 233 (2+2+2+2) * exception_table_length + // exception_table
226 234 2 + // attributes_count
227 235 attr_size; // attributes
228 236
229 237 write_attribute_name_index("Code");
230 238 write_u4(size);
231 239 write_u2(method->verifier_max_stack());
232 240 write_u2(method->max_locals());
233 241 write_u4(code_size);
234 242 copy_bytecodes(method, (unsigned char*)writeable_address(code_size));
235 243 write_u2(exception_table_length);
236 244 for (int index = 0; index < exception_table_length; index++) {
237 245 write_u2(exception_table.start_pc(index));
238 246 write_u2(exception_table.end_pc(index));
239 247 write_u2(exception_table.handler_pc(index));
240 248 write_u2(exception_table.catch_type_index(index));
241 249 }
242 250 write_u2(attr_count);
243 251 if (line_num_cnt != 0) {
244 252 write_line_number_table_attribute(method, line_num_cnt);
245 253 }
246 254 if (stackmap_len != 0) {
247 255 write_stackmap_table_attribute(method, stackmap_len);
248 256 }
249 257 if (local_variable_table_length != 0) {
250 258 write_local_variable_table_attribute(method, local_variable_table_length);
251 259 }
252 260 if (local_variable_type_table_length != 0) {
253 261 write_local_variable_type_table_attribute(method, local_variable_type_table_length);
254 262 }
255 263 }
256 264
257 265 // Write Exceptions attribute
258 266 // JVMSpec| Exceptions_attribute {
259 267 // JVMSpec| u2 attribute_name_index;
260 268 // JVMSpec| u4 attribute_length;
261 269 // JVMSpec| u2 number_of_exceptions;
262 270 // JVMSpec| u2 exception_index_table[number_of_exceptions];
263 271 // JVMSpec| }
264 272 void JvmtiClassFileReconstituter::write_exceptions_attribute(ConstMethod* const_method) {
265 273 CheckedExceptionElement* checked_exceptions = const_method->checked_exceptions_start();
266 274 int checked_exceptions_length = const_method->checked_exceptions_length();
267 275 int size =
268 276 2 + // number_of_exceptions
269 277 2 * checked_exceptions_length; // exception_index_table
270 278
271 279 write_attribute_name_index("Exceptions");
272 280 write_u4(size);
273 281 write_u2(checked_exceptions_length);
274 282 for (int index = 0; index < checked_exceptions_length; index++) {
275 283 write_u2(checked_exceptions[index].class_cp_index);
276 284 }
277 285 }
278 286
279 287 // Write SourceFile attribute
280 288 // JVMSpec| SourceFile_attribute {
281 289 // JVMSpec| u2 attribute_name_index;
282 290 // JVMSpec| u4 attribute_length;
283 291 // JVMSpec| u2 sourcefile_index;
284 292 // JVMSpec| }
285 293 void JvmtiClassFileReconstituter::write_source_file_attribute() {
286 294 assert(ikh()->source_file_name() != NULL, "caller must check");
287 295
288 296 write_attribute_name_index("SourceFile");
289 297 write_u4(2); // always length 2
290 298 write_u2(symbol_to_cpool_index(ikh()->source_file_name()));
291 299 }
292 300
293 301 // Write SourceDebugExtension attribute
294 302 // JSR45| SourceDebugExtension_attribute {
295 303 // JSR45| u2 attribute_name_index;
296 304 // JSR45| u4 attribute_length;
297 305 // JSR45| u1 debug_extension[attribute_length];
298 306 // JSR45| }
299 307 void JvmtiClassFileReconstituter::write_source_debug_extension_attribute() {
300 308 assert(ikh()->source_debug_extension() != NULL, "caller must check");
301 309
302 310 write_attribute_name_index("SourceDebugExtension");
303 311 int len = (int)strlen(ikh()->source_debug_extension());
304 312 write_u4(len);
305 313 u1* ext = (u1*)ikh()->source_debug_extension();
306 314 for (int i=0; i<len; i++) {
307 315 write_u1(ext[i]);
308 316 }
309 317 }
310 318
311 319 // Write (generic) Signature attribute
312 320 // JVMSpec| Signature_attribute {
313 321 // JVMSpec| u2 attribute_name_index;
314 322 // JVMSpec| u4 attribute_length;
315 323 // JVMSpec| u2 signature_index;
316 324 // JVMSpec| }
317 325 void JvmtiClassFileReconstituter::write_signature_attribute(u2 generic_signature_index) {
318 326 write_attribute_name_index("Signature");
319 327 write_u4(2); // always length 2
320 328 write_u2(generic_signature_index);
321 329 }
322 330
323 331 // Compute the number of entries in the InnerClasses attribute
324 332 u2 JvmtiClassFileReconstituter::inner_classes_attribute_length() {
325 333 InnerClassesIterator iter(ikh());
326 334 return iter.length();
327 335 }
328 336
329 337 // Write an annotation attribute. The VM stores them in raw form, so all we need
330 338 // to do is add the attrubute name and fill in the length.
331 339 // JSR202| *Annotations_attribute {
332 340 // JSR202| u2 attribute_name_index;
333 341 // JSR202| u4 attribute_length;
334 342 // JSR202| ...
335 343 // JSR202| }
336 344 void JvmtiClassFileReconstituter::write_annotations_attribute(const char* attr_name,
337 345 AnnotationArray* annos) {
338 346 u4 length = annos->length();
339 347 write_attribute_name_index(attr_name);
340 348 write_u4(length);
341 349 memcpy(writeable_address(length), annos->adr_at(0), length);
342 350 }
343 351
344 352 // BootstrapMethods_attribute {
345 353 // u2 attribute_name_index;
346 354 // u4 attribute_length;
347 355 // u2 num_bootstrap_methods;
348 356 // { u2 bootstrap_method_ref;
349 357 // u2 num_bootstrap_arguments;
350 358 // u2 bootstrap_arguments[num_bootstrap_arguments];
351 359 // } bootstrap_methods[num_bootstrap_methods];
352 360 // }
353 361 void JvmtiClassFileReconstituter::write_bootstrapmethod_attribute() {
354 362 Array<u2>* operands = cpool()->operands();
355 363 write_attribute_name_index("BootstrapMethods");
356 364 int num_bootstrap_methods = ConstantPool::operand_array_length(operands);
357 365
358 366 // calculate length of attribute
359 367 int length = sizeof(u2); // num_bootstrap_methods
360 368 for (int n = 0; n < num_bootstrap_methods; n++) {
361 369 u2 num_bootstrap_arguments = cpool()->operand_argument_count_at(n);
362 370 length += sizeof(u2); // bootstrap_method_ref
363 371 length += sizeof(u2); // num_bootstrap_arguments
364 372 length += sizeof(u2) * num_bootstrap_arguments; // bootstrap_arguments[num_bootstrap_arguments]
365 373 }
366 374 write_u4(length);
367 375
368 376 // write attribute
369 377 write_u2(num_bootstrap_methods);
370 378 for (int n = 0; n < num_bootstrap_methods; n++) {
371 379 u2 bootstrap_method_ref = cpool()->operand_bootstrap_method_ref_index_at(n);
372 380 u2 num_bootstrap_arguments = cpool()->operand_argument_count_at(n);
373 381 write_u2(bootstrap_method_ref);
374 382 write_u2(num_bootstrap_arguments);
375 383 for (int arg = 0; arg < num_bootstrap_arguments; arg++) {
376 384 u2 bootstrap_argument = cpool()->operand_argument_index_at(n, arg);
377 385 write_u2(bootstrap_argument);
378 386 }
379 387 }
380 388 }
381 389
382 390
383 391 // Write InnerClasses attribute
384 392 // JVMSpec| InnerClasses_attribute {
385 393 // JVMSpec| u2 attribute_name_index;
386 394 // JVMSpec| u4 attribute_length;
387 395 // JVMSpec| u2 number_of_classes;
388 396 // JVMSpec| { u2 inner_class_info_index;
389 397 // JVMSpec| u2 outer_class_info_index;
390 398 // JVMSpec| u2 inner_name_index;
391 399 // JVMSpec| u2 inner_class_access_flags;
392 400 // JVMSpec| } classes[number_of_classes];
393 401 // JVMSpec| }
394 402 void JvmtiClassFileReconstituter::write_inner_classes_attribute(int length) {
395 403 InnerClassesIterator iter(ikh());
396 404 guarantee(iter.length() != 0 && iter.length() == length,
397 405 "caller must check");
398 406 u2 entry_count = length / InstanceKlass::inner_class_next_offset;
399 407 u4 size = 2 + entry_count * (2+2+2+2);
400 408
401 409 write_attribute_name_index("InnerClasses");
402 410 write_u4(size);
403 411 write_u2(entry_count);
404 412 for (; !iter.done(); iter.next()) {
405 413 write_u2(iter.inner_class_info_index());
406 414 write_u2(iter.outer_class_info_index());
407 415 write_u2(iter.inner_name_index());
408 416 write_u2(iter.inner_access_flags());
409 417 }
410 418 }
411 419
412 420 // Write Synthetic attribute
413 421 // JVMSpec| Synthetic_attribute {
414 422 // JVMSpec| u2 attribute_name_index;
415 423 // JVMSpec| u4 attribute_length;
416 424 // JVMSpec| }
417 425 void JvmtiClassFileReconstituter::write_synthetic_attribute() {
418 426 write_attribute_name_index("Synthetic");
419 427 write_u4(0); //length always zero
420 428 }
421 429
422 430 // Compute size of LineNumberTable
423 431 u2 JvmtiClassFileReconstituter::line_number_table_entries(methodHandle method) {
424 432 // The line number table is compressed so we don't know how big it is until decompressed.
425 433 // Decompression is really fast so we just do it twice.
426 434 u2 num_entries = 0;
427 435 CompressedLineNumberReadStream stream(method->compressed_linenumber_table());
428 436 while (stream.read_pair()) {
429 437 num_entries++;
430 438 }
431 439 return num_entries;
432 440 }
433 441
434 442 // Write LineNumberTable attribute
435 443 // JVMSpec| LineNumberTable_attribute {
436 444 // JVMSpec| u2 attribute_name_index;
437 445 // JVMSpec| u4 attribute_length;
438 446 // JVMSpec| u2 line_number_table_length;
439 447 // JVMSpec| { u2 start_pc;
440 448 // JVMSpec| u2 line_number;
441 449 // JVMSpec| } line_number_table[line_number_table_length];
442 450 // JVMSpec| }
443 451 void JvmtiClassFileReconstituter::write_line_number_table_attribute(methodHandle method,
444 452 u2 num_entries) {
445 453
446 454 write_attribute_name_index("LineNumberTable");
447 455 write_u4(2 + num_entries * (2 + 2));
448 456 write_u2(num_entries);
449 457
450 458 CompressedLineNumberReadStream stream(method->compressed_linenumber_table());
451 459 while (stream.read_pair()) {
452 460 write_u2(stream.bci());
453 461 write_u2(stream.line());
454 462 }
455 463 }
456 464
457 465 // Write LocalVariableTable attribute
458 466 // JVMSpec| LocalVariableTable_attribute {
459 467 // JVMSpec| u2 attribute_name_index;
460 468 // JVMSpec| u4 attribute_length;
461 469 // JVMSpec| u2 local_variable_table_length;
462 470 // JVMSpec| { u2 start_pc;
463 471 // JVMSpec| u2 length;
464 472 // JVMSpec| u2 name_index;
465 473 // JVMSpec| u2 descriptor_index;
466 474 // JVMSpec| u2 index;
467 475 // JVMSpec| } local_variable_table[local_variable_table_length];
468 476 // JVMSpec| }
469 477 void JvmtiClassFileReconstituter::write_local_variable_table_attribute(methodHandle method, u2 num_entries) {
470 478 write_attribute_name_index("LocalVariableTable");
471 479 write_u4(2 + num_entries * (2 + 2 + 2 + 2 + 2));
472 480 write_u2(num_entries);
473 481
474 482 assert(method->localvariable_table_length() == num_entries, "just checking");
475 483
476 484 LocalVariableTableElement *elem = method->localvariable_table_start();
477 485 for (int j=0; j<method->localvariable_table_length(); j++) {
478 486 write_u2(elem->start_bci);
479 487 write_u2(elem->length);
480 488 write_u2(elem->name_cp_index);
481 489 write_u2(elem->descriptor_cp_index);
482 490 write_u2(elem->slot);
483 491 elem++;
484 492 }
485 493 }
486 494
487 495 // Write LocalVariableTypeTable attribute
488 496 // JVMSpec| LocalVariableTypeTable_attribute {
489 497 // JVMSpec| u2 attribute_name_index;
490 498 // JVMSpec| u4 attribute_length;
491 499 // JVMSpec| u2 local_variable_type_table_length;
492 500 // JVMSpec| { u2 start_pc;
493 501 // JVMSpec| u2 length;
494 502 // JVMSpec| u2 name_index;
495 503 // JVMSpec| u2 signature_index;
496 504 // JVMSpec| u2 index;
497 505 // JVMSpec| } local_variable_type_table[local_variable_type_table_length];
498 506 // JVMSpec| }
499 507 void JvmtiClassFileReconstituter::write_local_variable_type_table_attribute(methodHandle method, u2 num_entries) {
500 508 write_attribute_name_index("LocalVariableTypeTable");
501 509 write_u4(2 + num_entries * (2 + 2 + 2 + 2 + 2));
502 510 write_u2(num_entries);
503 511
504 512 LocalVariableTableElement *elem = method->localvariable_table_start();
505 513 for (int j=0; j<method->localvariable_table_length(); j++) {
506 514 if (elem->signature_cp_index > 0) {
507 515 // Local variable has a generic signature - write LVTT attribute entry
508 516 write_u2(elem->start_bci);
509 517 write_u2(elem->length);
510 518 write_u2(elem->name_cp_index);
511 519 write_u2(elem->signature_cp_index);
512 520 write_u2(elem->slot);
513 521 num_entries--;
514 522 }
515 523 elem++;
516 524 }
517 525 assert(num_entries == 0, "just checking");
518 526 }
519 527
520 528 // Write stack map table attribute
521 529 // JSR-202| StackMapTable_attribute {
522 530 // JSR-202| u2 attribute_name_index;
523 531 // JSR-202| u4 attribute_length;
524 532 // JSR-202| u2 number_of_entries;
525 533 // JSR-202| stack_map_frame_entries[number_of_entries];
526 534 // JSR-202| }
527 535 void JvmtiClassFileReconstituter::write_stackmap_table_attribute(methodHandle method,
528 536 int stackmap_len) {
529 537
530 538 write_attribute_name_index("StackMapTable");
531 539 write_u4(stackmap_len);
532 540 memcpy(
533 541 writeable_address(stackmap_len),
534 542 (void*)(method->stackmap_data()->adr_at(0)),
535 543 stackmap_len);
536 544 }
537 545
538 546 // Write one method_info structure
539 547 // JVMSpec| method_info {
540 548 // JVMSpec| u2 access_flags;
541 549 // JVMSpec| u2 name_index;
542 550 // JVMSpec| u2 descriptor_index;
|
↓ open down ↓ |
420 lines elided |
↑ open up ↑ |
543 551 // JVMSpec| u2 attributes_count;
544 552 // JVMSpec| attribute_info attributes[attributes_count];
545 553 // JVMSpec| }
546 554 void JvmtiClassFileReconstituter::write_method_info(methodHandle method) {
547 555 AccessFlags access_flags = method->access_flags();
548 556 ConstMethod* const_method = method->constMethod();
549 557 u2 generic_signature_index = const_method->generic_signature_index();
550 558 AnnotationArray* anno = method->annotations();
551 559 AnnotationArray* param_anno = method->parameter_annotations();
552 560 AnnotationArray* default_anno = method->annotation_default();
561 + AnnotationArray* type_anno = method->type_annotations();
553 562
554 563 // skip generated default interface methods
555 564 if (method->is_overpass()) {
556 565 return;
557 566 }
558 567
559 568 write_u2(access_flags.get_flags() & JVM_RECOGNIZED_METHOD_MODIFIERS);
560 569 write_u2(const_method->name_index());
561 570 write_u2(const_method->signature_index());
562 571
563 572 // write attributes in the same order javac does, so we can test with byte for
564 573 // byte comparison
565 574 int attr_count = 0;
566 575 if (const_method->code_size() != 0) {
567 576 ++attr_count; // has Code attribute
568 577 }
569 578 if (const_method->has_checked_exceptions()) {
570 579 ++attr_count; // has Exceptions attribute
571 580 }
572 581 if (default_anno != NULL) {
573 582 ++attr_count; // has AnnotationDefault attribute
574 583 }
575 584 // Deprecated attribute would go here
576 585 if (access_flags.is_synthetic()) { // FIXME
577 586 // ++attr_count;
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
578 587 }
579 588 if (generic_signature_index != 0) {
580 589 ++attr_count;
581 590 }
582 591 if (anno != NULL) {
583 592 ++attr_count; // has RuntimeVisibleAnnotations attribute
584 593 }
585 594 if (param_anno != NULL) {
586 595 ++attr_count; // has RuntimeVisibleParameterAnnotations attribute
587 596 }
597 + if (type_anno != NULL) {
598 + ++attr_count; // has RuntimeVisibleTypeAnnotations attribute
599 + }
588 600
589 601 write_u2(attr_count);
590 602 if (const_method->code_size() > 0) {
591 603 write_code_attribute(method);
592 604 }
593 605 if (const_method->has_checked_exceptions()) {
594 606 write_exceptions_attribute(const_method);
595 607 }
596 608 if (default_anno != NULL) {
597 609 write_annotations_attribute("AnnotationDefault", default_anno);
598 610 }
599 611 // Deprecated attribute would go here
600 612 if (access_flags.is_synthetic()) {
601 613 // write_synthetic_attribute();
|
↓ open down ↓ |
4 lines elided |
↑ open up ↑ |
602 614 }
603 615 if (generic_signature_index != 0) {
604 616 write_signature_attribute(generic_signature_index);
605 617 }
606 618 if (anno != NULL) {
607 619 write_annotations_attribute("RuntimeVisibleAnnotations", anno);
608 620 }
609 621 if (param_anno != NULL) {
610 622 write_annotations_attribute("RuntimeVisibleParameterAnnotations", param_anno);
611 623 }
624 + if (type_anno != NULL) {
625 + write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
626 + }
612 627 }
613 628
614 629 // Write the class attributes portion of ClassFile structure
615 630 // JVMSpec| u2 attributes_count;
616 631 // JVMSpec| attribute_info attributes[attributes_count];
617 632 void JvmtiClassFileReconstituter::write_class_attributes() {
618 633 u2 inner_classes_length = inner_classes_attribute_length();
619 634 Symbol* generic_signature = ikh()->generic_signature();
620 635 AnnotationArray* anno = ikh()->class_annotations();
636 + AnnotationArray* type_anno = ikh()->class_type_annotations();
621 637
622 638 int attr_count = 0;
623 639 if (generic_signature != NULL) {
624 640 ++attr_count;
625 641 }
626 642 if (ikh()->source_file_name() != NULL) {
627 643 ++attr_count;
628 644 }
629 645 if (ikh()->source_debug_extension() != NULL) {
630 646 ++attr_count;
631 647 }
632 648 if (inner_classes_length > 0) {
633 649 ++attr_count;
634 650 }
635 651 if (anno != NULL) {
636 652 ++attr_count; // has RuntimeVisibleAnnotations attribute
637 653 }
654 + if (type_anno != NULL) {
655 + ++attr_count; // has RuntimeVisibleTypeAnnotations attribute
656 + }
638 657 if (cpool()->operands() != NULL) {
639 658 ++attr_count;
640 659 }
641 660
642 661 write_u2(attr_count);
643 662
644 663 if (generic_signature != NULL) {
645 664 write_signature_attribute(symbol_to_cpool_index(generic_signature));
646 665 }
647 666 if (ikh()->source_file_name() != NULL) {
648 667 write_source_file_attribute();
|
↓ open down ↓ |
1 lines elided |
↑ open up ↑ |
649 668 }
650 669 if (ikh()->source_debug_extension() != NULL) {
651 670 write_source_debug_extension_attribute();
652 671 }
653 672 if (inner_classes_length > 0) {
654 673 write_inner_classes_attribute(inner_classes_length);
655 674 }
656 675 if (anno != NULL) {
657 676 write_annotations_attribute("RuntimeVisibleAnnotations", anno);
658 677 }
678 + if (type_anno != NULL) {
679 + write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
680 + }
659 681 if (cpool()->operands() != NULL) {
660 682 write_bootstrapmethod_attribute();
661 683 }
662 684 }
663 685
664 686 // Write the method information portion of ClassFile structure
665 687 // JVMSpec| u2 methods_count;
666 688 // JVMSpec| method_info methods[methods_count];
667 689 void JvmtiClassFileReconstituter::write_method_infos() {
668 690 HandleMark hm(thread());
669 691 Array<Method*>* methods = ikh()->methods();
670 692 int num_methods = methods->length();
671 693 int num_overpass = 0;
672 694
673 695 // count the generated default interface methods
674 696 // these will not be re-created by write_method_info
675 697 // and should not be included in the total count
676 698 for (int index = 0; index < num_methods; index++) {
677 699 Method* method = methods->at(index);
678 700 if (method->is_overpass()) {
679 701 num_overpass++;
680 702 }
681 703 }
682 704
683 705 write_u2(num_methods - num_overpass);
684 706 if (JvmtiExport::can_maintain_original_method_order()) {
685 707 int index;
686 708 int original_index;
687 709 intArray method_order(num_methods, 0);
688 710
689 711 // invert the method order mapping
690 712 for (index = 0; index < num_methods; index++) {
691 713 original_index = ikh()->method_ordering()->at(index);
692 714 assert(original_index >= 0 && original_index < num_methods,
693 715 "invalid original method index");
694 716 method_order.at_put(original_index, index);
695 717 }
696 718
697 719 // write in original order
698 720 for (original_index = 0; original_index < num_methods; original_index++) {
699 721 index = method_order.at(original_index);
700 722 methodHandle method(thread(), methods->at(index));
701 723 write_method_info(method);
702 724 }
703 725 } else {
704 726 // method order not preserved just dump the method infos
705 727 for (int index = 0; index < num_methods; index++) {
706 728 methodHandle method(thread(), methods->at(index));
707 729 write_method_info(method);
708 730 }
709 731 }
710 732 }
711 733
712 734 void JvmtiClassFileReconstituter::write_class_file_format() {
713 735 ReallocMark();
714 736
715 737 // JVMSpec| ClassFile {
716 738 // JVMSpec| u4 magic;
717 739 write_u4(0xCAFEBABE);
718 740
719 741 // JVMSpec| u2 minor_version;
720 742 // JVMSpec| u2 major_version;
721 743 write_u2(ikh()->minor_version());
722 744 u2 major = ikh()->major_version();
723 745 write_u2(major);
724 746
725 747 // JVMSpec| u2 constant_pool_count;
726 748 // JVMSpec| cp_info constant_pool[constant_pool_count-1];
727 749 write_u2(cpool()->length());
728 750 copy_cpool_bytes(writeable_address(cpool_size()));
729 751
730 752 // JVMSpec| u2 access_flags;
731 753 write_u2(ikh()->access_flags().get_flags() & JVM_RECOGNIZED_CLASS_MODIFIERS);
732 754
733 755 // JVMSpec| u2 this_class;
734 756 // JVMSpec| u2 super_class;
735 757 write_u2(class_symbol_to_cpool_index(ikh()->name()));
736 758 Klass* super_class = ikh()->super();
737 759 write_u2(super_class == NULL? 0 : // zero for java.lang.Object
738 760 class_symbol_to_cpool_index(super_class->name()));
739 761
740 762 // JVMSpec| u2 interfaces_count;
741 763 // JVMSpec| u2 interfaces[interfaces_count];
742 764 Array<Klass*>* interfaces = ikh()->local_interfaces();
743 765 int num_interfaces = interfaces->length();
744 766 write_u2(num_interfaces);
745 767 for (int index = 0; index < num_interfaces; index++) {
746 768 HandleMark hm(thread());
747 769 instanceKlassHandle iikh(thread(), interfaces->at(index));
748 770 write_u2(class_symbol_to_cpool_index(iikh->name()));
749 771 }
750 772
751 773 // JVMSpec| u2 fields_count;
752 774 // JVMSpec| field_info fields[fields_count];
753 775 write_field_infos();
754 776
755 777 // JVMSpec| u2 methods_count;
756 778 // JVMSpec| method_info methods[methods_count];
757 779 write_method_infos();
758 780
759 781 // JVMSpec| u2 attributes_count;
760 782 // JVMSpec| attribute_info attributes[attributes_count];
761 783 // JVMSpec| } /* end ClassFile 8?
762 784 write_class_attributes();
763 785 }
764 786
765 787 address JvmtiClassFileReconstituter::writeable_address(size_t size) {
766 788 size_t used_size = _buffer_ptr - _buffer;
767 789 if (size + used_size >= _buffer_size) {
768 790 // compute the new buffer size: must be at least twice as big as before
769 791 // plus whatever new is being used; then convert to nice clean block boundary
770 792 size_t new_buffer_size = (size + _buffer_size*2 + 1) / initial_buffer_size
771 793 * initial_buffer_size;
772 794
773 795 // VM goes belly-up if the memory isn't available, so cannot do OOM processing
774 796 _buffer = REALLOC_RESOURCE_ARRAY(u1, _buffer, _buffer_size, new_buffer_size);
775 797 _buffer_size = new_buffer_size;
776 798 _buffer_ptr = _buffer + used_size;
777 799 }
778 800 u1* ret_ptr = _buffer_ptr;
779 801 _buffer_ptr += size;
780 802 return ret_ptr;
781 803 }
782 804
783 805 void JvmtiClassFileReconstituter::write_attribute_name_index(const char* name) {
784 806 TempNewSymbol sym = SymbolTable::probe(name, (int)strlen(name));
785 807 assert(sym != NULL, "attribute name symbol not found");
786 808 u2 attr_name_index = symbol_to_cpool_index(sym);
787 809 assert(attr_name_index != 0, "attribute name symbol not in constant pool");
788 810 write_u2(attr_name_index);
789 811 }
790 812
791 813 void JvmtiClassFileReconstituter::write_u1(u1 x) {
792 814 *writeable_address(1) = x;
793 815 }
794 816
795 817 void JvmtiClassFileReconstituter::write_u2(u2 x) {
796 818 Bytes::put_Java_u2(writeable_address(2), x);
797 819 }
798 820
799 821 void JvmtiClassFileReconstituter::write_u4(u4 x) {
800 822 Bytes::put_Java_u4(writeable_address(4), x);
801 823 }
802 824
803 825 void JvmtiClassFileReconstituter::write_u8(u8 x) {
804 826 Bytes::put_Java_u8(writeable_address(8), x);
805 827 }
806 828
807 829 void JvmtiClassFileReconstituter::copy_bytecodes(methodHandle mh,
808 830 unsigned char* bytecodes) {
809 831 // use a BytecodeStream to iterate over the bytecodes. JVM/fast bytecodes
810 832 // and the breakpoint bytecode are converted to their original bytecodes.
811 833
812 834 BytecodeStream bs(mh);
813 835
814 836 unsigned char* p = bytecodes;
815 837 Bytecodes::Code code;
816 838 bool is_rewritten = mh->method_holder()->is_rewritten();
817 839
818 840 while ((code = bs.next()) >= 0) {
819 841 assert(Bytecodes::is_java_code(code), "sanity check");
820 842 assert(code != Bytecodes::_breakpoint, "sanity check");
821 843
822 844 // length of bytecode (mnemonic + operands)
823 845 address bcp = bs.bcp();
824 846 int len = bs.instruction_size();
825 847 assert(len > 0, "length must be > 0");
826 848
827 849 // copy the bytecodes
828 850 *p = (unsigned char) (bs.is_wide()? Bytecodes::_wide : code);
829 851 if (len > 1) {
830 852 memcpy(p+1, bcp+1, len-1);
831 853 }
832 854
833 855 // During linking the get/put and invoke instructions are rewritten
834 856 // with an index into the constant pool cache. The original constant
835 857 // pool index must be returned to caller. Rewrite the index.
836 858 if (is_rewritten && len > 1) {
837 859 bool is_wide = false;
838 860 switch (code) {
839 861 case Bytecodes::_getstatic : // fall through
840 862 case Bytecodes::_putstatic : // fall through
841 863 case Bytecodes::_getfield : // fall through
842 864 case Bytecodes::_putfield : // fall through
843 865 case Bytecodes::_invokevirtual : // fall through
844 866 case Bytecodes::_invokespecial : // fall through
845 867 case Bytecodes::_invokestatic : // fall through
846 868 case Bytecodes::_invokedynamic : // fall through
847 869 case Bytecodes::_invokeinterface : {
848 870 assert(len == 3 ||
849 871 (code == Bytecodes::_invokeinterface && len == 5) ||
850 872 (code == Bytecodes::_invokedynamic && len == 5),
851 873 "sanity check");
852 874
853 875 int cpci = Bytes::get_native_u2(bcp+1);
854 876 bool is_invokedynamic = (EnableInvokeDynamic && code == Bytecodes::_invokedynamic);
855 877 ConstantPoolCacheEntry* entry;
856 878 if (is_invokedynamic) {
857 879 cpci = Bytes::get_native_u4(bcp+1);
858 880 entry = mh->constants()->invokedynamic_cp_cache_entry_at(cpci);
859 881 } else {
860 882 // cache cannot be pre-fetched since some classes won't have it yet
861 883 entry = mh->constants()->cache()->entry_at(cpci);
862 884 }
863 885 int i = entry->constant_pool_index();
864 886 assert(i < mh->constants()->length(), "sanity check");
865 887 Bytes::put_Java_u2((address)(p+1), (u2)i); // java byte ordering
866 888 if (is_invokedynamic) *(p+3) = *(p+4) = 0;
867 889 break;
868 890 }
869 891 case Bytecodes::_ldc_w:
870 892 is_wide = true; // fall through
871 893 case Bytecodes::_ldc: {
872 894 if (bs.raw_code() == Bytecodes::_fast_aldc || bs.raw_code() == Bytecodes::_fast_aldc_w) {
873 895 int cpci = is_wide ? Bytes::get_native_u2(bcp+1) : (u1)(*(bcp+1));
874 896 int i = mh->constants()->object_to_cp_index(cpci);
875 897 assert(i < mh->constants()->length(), "sanity check");
876 898 if (is_wide) {
877 899 Bytes::put_Java_u2((address)(p+1), (u2)i); // java byte ordering
878 900 } else {
879 901 *(p+1) = (u1)i;
880 902 }
881 903 }
882 904 break;
883 905 }
884 906 }
885 907 }
886 908
887 909 p += len;
888 910 }
889 911 }
|
↓ open down ↓ |
221 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX