commit 976fd97ddf11662e0221ce6b0c4ae11fa36c9130
author Krystal Mok <rednaxelafx@gmail.com> Tue Jun 28 14:30:27 2011 -0700
committer Vladimir Kozlov <kvn@openjdk.org> Tue Jun 28 14:30:27 2011 -0700
tree 93e4209625f690298a8984e5eb4807a497bd3bd0
parent 8df44305c715f7e2b15c5e45b30b9a7091a594be

7058036: FieldsAllocationStyle=2 does not work in 32-bit VM

ParseClassFile() incorrectly uses nonstatic_oop_map_size() method instead of nonstatic_oop_map_count().

Reviewed-by: never

hotspot/src/share/vm/classfile/classFileParser.cpp

diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 0593639..4c664bd 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -3287,9 +3287,9 @@
       // Fields allocation: oops fields in super and sub classes are together.
       if( nonstatic_field_size > 0 && super_klass() != NULL &&
           super_klass->nonstatic_oop_map_size() > 0 ) {
-        int map_size = super_klass->nonstatic_oop_map_size();
+        int map_count = super_klass->nonstatic_oop_map_count();
         OopMapBlock* first_map = super_klass->start_of_nonstatic_oop_maps();
-        OopMapBlock* last_map = first_map + map_size - 1;
+        OopMapBlock* last_map = first_map + map_count - 1;
         int next_offset = last_map->offset() + (last_map->count() * heapOopSize);
         if (next_offset == next_nonstatic_field_offset) {
           allocation_style = 0;   // allocate oops first