1.1 --- a/src/share/vm/opto/compile.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/share/vm/opto/compile.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -1306,12 +1306,12 @@
1.4 // these 2 disparate memories into the same alias class. Since the
1.5 // primary supertype array is read-only, there's no chance of confusion
1.6 // where we bypass an array load and an array store.
1.7 - int primary_supers_offset = sizeof(klassOopDesc) + Klass::primary_supers_offset_in_bytes();
1.8 + int primary_supers_offset = in_bytes(Klass::primary_supers_offset());
1.9 if (offset == Type::OffsetBot ||
1.10 (offset >= primary_supers_offset &&
1.11 offset < (int)(primary_supers_offset + Klass::primary_super_limit() * wordSize)) ||
1.12 - offset == (int)(sizeof(klassOopDesc) + Klass::secondary_super_cache_offset_in_bytes())) {
1.13 - offset = sizeof(klassOopDesc) + Klass::secondary_super_cache_offset_in_bytes();
1.14 + offset == (int)in_bytes(Klass::secondary_super_cache_offset())) {
1.15 + offset = in_bytes(Klass::secondary_super_cache_offset());
1.16 tj = tk = TypeKlassPtr::make( TypePtr::NotNull, tk->klass(), offset );
1.17 }
1.18 }
1.19 @@ -1490,13 +1490,13 @@
1.20 alias_type(idx)->set_rewritable(false);
1.21 }
1.22 if (flat->isa_klassptr()) {
1.23 - if (flat->offset() == Klass::super_check_offset_offset_in_bytes() + (int)sizeof(oopDesc))
1.24 + if (flat->offset() == in_bytes(Klass::super_check_offset_offset()))
1.25 alias_type(idx)->set_rewritable(false);
1.26 - if (flat->offset() == Klass::modifier_flags_offset_in_bytes() + (int)sizeof(oopDesc))
1.27 + if (flat->offset() == in_bytes(Klass::modifier_flags_offset()))
1.28 alias_type(idx)->set_rewritable(false);
1.29 - if (flat->offset() == Klass::access_flags_offset_in_bytes() + (int)sizeof(oopDesc))
1.30 + if (flat->offset() == in_bytes(Klass::access_flags_offset()))
1.31 alias_type(idx)->set_rewritable(false);
1.32 - if (flat->offset() == Klass::java_mirror_offset_in_bytes() + (int)sizeof(oopDesc))
1.33 + if (flat->offset() == in_bytes(Klass::java_mirror_offset()))
1.34 alias_type(idx)->set_rewritable(false);
1.35 }
1.36 // %%% (We would like to finalize JavaThread::threadObj_offset(),
