Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Wed Jan 22 12:37:28 2014 -0800
     1.2 +++ b/.hgtags	Thu Jan 23 14:50:08 2014 -0800
     1.3 @@ -410,6 +410,8 @@
     1.4  591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123
     1.5  9b9816164447214f21b06ccf646893c281c76a42 hs25-b66
     1.6  df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124
     1.7 +3585183c191aa6b4d0375ea659515335e1804417 hs25-b67
     1.8 +df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b125
     1.9  4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
    1.10  e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02
    1.11  2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03

     2.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Wed Jan 22 12:37:28 2014 -0800
     2.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Jan 23 14:50:08 2014 -0800
     2.3 @@ -38,6 +38,7 @@
     2.4  #include "nativeInst_x86.hpp"
     2.5  #include "oops/objArrayKlass.hpp"
     2.6  #include "runtime/sharedRuntime.hpp"
     2.7 +#include "vmreg_x86.inline.hpp"
     2.8  
     2.9  
    2.10  // These masks are used to provide 128-bit aligned bitmasks to the XMM
    2.11 @@ -1006,6 +1007,9 @@
    2.12      if (UseCompressedOops && !wide) {
    2.13        __ movptr(compressed_src, src->as_register());
    2.14        __ encode_heap_oop(compressed_src);
    2.15 +      if (patch_code != lir_patch_none) {
    2.16 +        info->oop_map()->set_narrowoop(compressed_src->as_VMReg());
    2.17 +      }
    2.18      }
    2.19  #endif
    2.20    }

     3.1 --- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Wed Jan 22 12:37:28 2014 -0800
     3.2 +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Thu Jan 23 14:50:08 2014 -0800
     3.3 @@ -941,6 +941,8 @@
     3.4      case vmIntrinsics::_updateCRC32: {
     3.5        LIRItem crc(x->argument_at(0), this);
     3.6        LIRItem val(x->argument_at(1), this);
     3.7 +      // val is destroyed by update_crc32
     3.8 +      val.set_destroys_register();
     3.9        crc.load_item();
    3.10        val.load_item();
    3.11        __ update_crc32(crc.result(), val.result(), result);