Mercurial > hg > truffle

changeset 17541:4aa6fa2864af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 23 Jan 2014 14:50:08 -0800
parents 2bac854670c0 (diff) c8218f1072a0 (current diff)
children 956c0e048ef2
files .hgtags make/hotspot_version
diffstat 4 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jan 22 14:07:14 2014 -0800
+++ b/.hgtags	Thu Jan 23 14:50:08 2014 -0800
@@ -412,3 +412,8 @@
 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124
 3585183c191aa6b4d0375ea659515335e1804417 hs25-b67
 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b125
+4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
+e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02
+2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03
+5ac720d47ab83f8eb2f5fe3641667823a0298f41 jdk8u5-b04
+b90de55aca30678ab0fec05d6a61bb3468b783d2 jdk8u5-b05
--- a/.jcheck/conf	Wed Jan 22 14:07:14 2014 -0800
+++ b/.jcheck/conf	Thu Jan 23 14:50:08 2014 -0800
@@ -1,1 +1,2 @@
 project=jdk8
+bugids=dup
--- a/make/hotspot_version	Wed Jan 22 14:07:14 2014 -0800
+++ b/make/hotspot_version	Thu Jan 23 14:50:08 2014 -0800
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=0
-HS_BUILD_NUMBER=67
+HS_MINOR_VER=5
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/src/share/vm/oops/objArrayKlass.cpp	Wed Jan 22 14:07:14 2014 -0800
+++ b/src/share/vm/oops/objArrayKlass.cpp	Thu Jan 23 14:50:08 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);