Mercurial > hg > truffle
changeset 17501:c8218f1072a0 jdk8-b126
Merge
author | katleman |
---|---|
date | Wed, 22 Jan 2014 14:07:14 -0800 |
parents | 55ff9170e27d (current diff) 5df2666e4573 (diff) |
children | 9a11d5e679cf d45454002494 4aa6fa2864af |
files | .hgtags |
diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jan 22 12:53:32 2014 -0800 +++ b/.hgtags Wed Jan 22 14:07:14 2014 -0800 @@ -409,4 +409,6 @@ d3521d8e562a782f66fc0dfdebeffba2c7e3471d jdk8-b122 591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123 9b9816164447214f21b06ccf646893c281c76a42 hs25-b66 +df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124 +3585183c191aa6b4d0375ea659515335e1804417 hs25-b67 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b125
--- a/make/hotspot_version Wed Jan 22 12:53:32 2014 -0800 +++ b/make/hotspot_version Wed Jan 22 14:07:14 2014 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2013 +HOTSPOT_VM_COPYRIGHT=Copyright 2014 HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=66 +HS_BUILD_NUMBER=67 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Jan 22 12:53:32 2014 -0800 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Jan 22 14:07:14 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:53:32 2014 -0800 +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Wed Jan 22 14:07:14 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);