comparison src/share/vm/oops/methodData.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents 836a62f43af9
children 096c224171c4
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
508 int empty_bc_count = 0; // number of bytecodes lacking data 508 int empty_bc_count = 0; // number of bytecodes lacking data
509 while ((c = stream.next()) >= 0) { 509 while ((c = stream.next()) >= 0) {
510 int size_in_bytes = compute_data_size(&stream); 510 int size_in_bytes = compute_data_size(&stream);
511 data_size += size_in_bytes; 511 data_size += size_in_bytes;
512 512
513 if (is_empty_data(size_in_bytes, c)) empty_bc_count++; 513 if (is_empty_data(size_in_bytes, c)) empty_bc_count += 1;
514 } 514 }
515 int object_size = in_bytes(data_offset()) + data_size; 515 int object_size = in_bytes(data_offset()) + data_size;
516 516
517 // Add some extra DataLayout cells (at least one) to track stray traps. 517 // Add some extra DataLayout cells (at least one) to track stray traps.
518 int extra_data_count = compute_extra_data_count(data_size, empty_bc_count); 518 int extra_data_count = compute_extra_data_count(data_size, empty_bc_count);
701 Bytecodes::Code c; 701 Bytecodes::Code c;
702 while ((c = stream.next()) >= 0) { 702 while ((c = stream.next()) >= 0) {
703 int size_in_bytes = initialize_data(&stream, data_size); 703 int size_in_bytes = initialize_data(&stream, data_size);
704 data_size += size_in_bytes; 704 data_size += size_in_bytes;
705 705
706 if (is_empty_data(size_in_bytes, c)) empty_bc_count++; 706 if (is_empty_data(size_in_bytes, c)) empty_bc_count += 1;
707 } 707 }
708 _data_size = data_size; 708 _data_size = data_size;
709 int object_size = in_bytes(data_offset()) + data_size; 709 int object_size = in_bytes(data_offset()) + data_size;
710 710
711 // Add some extra DataLayout cells (at least one) to track stray traps. 711 // Add some extra DataLayout cells (at least one) to track stray traps.