Mercurial > hg > truffle
changeset 17544:a9e1716111a7
Merge
author | asaha |
---|---|
date | Thu, 30 Jan 2014 14:09:56 -0800 |
parents | 2fdc8a2268d2 (diff) 874c0b4a946c (current diff) |
children | 4536a5ffd9b1 |
files | .hgtags make/hotspot_version |
diffstat | 4 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 30 12:16:41 2014 -0800 +++ b/.hgtags Thu Jan 30 14:09:56 2014 -0800 @@ -416,3 +416,9 @@ d45454002494d147c0761e6b37d8a73064f3cf92 hs25-b68 32f017489ba5dd1bedabb9fa1d26bcc74d0a72b6 hs25-b69 35038da7bb9ddd367a0a6bf926dfb281aee1d554 jdk8-b127 +4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01 +e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02 +2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03 +5ac720d47ab83f8eb2f5fe3641667823a0298f41 jdk8u5-b04 +b90de55aca30678ab0fec05d6a61bb3468b783d2 jdk8u5-b05 +956c0e048ef29ee9a8026fb05858abe64b4e0ceb jdk8u5-b06
--- a/.jcheck/conf Thu Jan 30 12:16:41 2014 -0800 +++ b/.jcheck/conf Thu Jan 30 14:09:56 2014 -0800 @@ -1,1 +1,2 @@ project=jdk8 +bugids=dup
--- a/make/hotspot_version Thu Jan 30 12:16:41 2014 -0800 +++ b/make/hotspot_version Thu Jan 30 14:09:56 2014 -0800 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2014 HS_MAJOR_VER=25 -HS_MINOR_VER=0 -HS_BUILD_NUMBER=69 +HS_MINOR_VER=5 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8
--- a/src/share/vm/oops/objArrayKlass.cpp Thu Jan 30 12:16:41 2014 -0800 +++ b/src/share/vm/oops/objArrayKlass.cpp Thu Jan 30 14:09:56 2014 -0800 @@ -269,7 +269,7 @@ if (element_is_null || (new_val->klass())->is_subtype_of(bound)) { bs->write_ref_field_pre(p, new_val); - *p = *from; + *p = element; } else { // We must do a barrier to cover the partial copy. const size_t pd = pointer_delta(p, dst, (size_t)heapOopSize);