Mercurial > hg > arm32-8u40
changeset 6141:4aa6fa2864af
Merge
| author | asaha |
|---|---|
| date | Thu, 23 Jan 2014 14:50:08 -0800 |
| parents | 2bac854670c0 (current diff) c8218f1072a0 (diff) |
| children | 956c0e048ef2 |
| files | .hgtags make/hotspot_version |
| diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jan 22 12:37:28 2014 -0800 +++ b/.hgtags Thu Jan 23 14:50:08 2014 -0800 @@ -410,6 +410,8 @@ 591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123 9b9816164447214f21b06ccf646893c281c76a42 hs25-b66 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124 +3585183c191aa6b4d0375ea659515335e1804417 hs25-b67 +df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b125 4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01 e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02 2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Jan 22 12:37:28 2014 -0800 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Thu Jan 23 14:50:08 2014 -0800 @@ -38,6 +38,7 @@ #include "nativeInst_x86.hpp" #include "oops/objArrayKlass.hpp" #include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" // These masks are used to provide 128-bit aligned bitmasks to the XMM @@ -1006,6 +1007,9 @@ if (UseCompressedOops && !wide) { __ movptr(compressed_src, src->as_register()); __ encode_heap_oop(compressed_src); + if (patch_code != lir_patch_none) { + info->oop_map()->set_narrowoop(compressed_src->as_VMReg()); + } } #endif }
--- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Wed Jan 22 12:37:28 2014 -0800 +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Thu Jan 23 14:50:08 2014 -0800 @@ -941,6 +941,8 @@ case vmIntrinsics::_updateCRC32: { LIRItem crc(x->argument_at(0), this); LIRItem val(x->argument_at(1), this); + // val is destroyed by update_crc32 + val.set_destroys_register(); crc.load_item(); val.load_item(); __ update_crc32(crc.result(), val.result(), result);