Mercurial > hg > truffle

changeset 17553:17a75e692af3 jdk8u5-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 03 Mar 2014 10:12:07 -0800
parents a7e6673a0f55 (diff) 5380dc5d007e (current diff)
children 0e9ec6d910fe
files .hgtags
diffstat 5 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Feb 28 13:36:09 2014 -0800
+++ b/.hgtags	Mon Mar 03 10:12:07 2014 -0800
@@ -420,3 +420,13 @@
 cb39165c4a65bbff8db356df411e762f9e5423b8 jdk8-b129
 1dbaf664a611e5d9cab6d1be42537b67d0d05f94 jdk8-b130
 b5e7ebfe185cb4c2eeb8a919025fc6a26be2fcef jdk8-b131
+4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
+e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02
+2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03
+5ac720d47ab83f8eb2f5fe3641667823a0298f41 jdk8u5-b04
+b90de55aca30678ab0fec05d6a61bb3468b783d2 jdk8u5-b05
+956c0e048ef29ee9a8026fb05858abe64b4e0ceb jdk8u5-b06
+46fa2940e6861df18a107b6b83a2df85239e5ec7 jdk8u5-b07
+21c1dfbed277791071947eed1c93806ccf48a7d8 jdk8u5-b08
+6af9ce1c56a6545ec6c992a5f61b2eec924be040 jdk8u5-b09
+629267e4f0b5155608edcd71922983be98786bd7 jdk8u5-b10
--- a/.jcheck/conf	Fri Feb 28 13:36:09 2014 -0800
+++ b/.jcheck/conf	Mon Mar 03 10:12:07 2014 -0800
@@ -1,1 +1,2 @@
 project=jdk8
+bugids=dup
--- a/THIRD_PARTY_README	Fri Feb 28 13:36:09 2014 -0800
+++ b/THIRD_PARTY_README	Mon Mar 03 10:12:07 2014 -0800
@@ -1399,13 +1399,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.4, which may be 
+%% This notice is provided with respect to Little CMS 2.5, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
 Little CMS
-Copyright (c) 1998-2010 Marti Maria Saguer
+Copyright (c) 1998-2011 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/make/hotspot_version	Fri Feb 28 13:36:09 2014 -0800
+++ b/make/hotspot_version	Mon Mar 03 10:12:07 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	Fri Feb 28 13:36:09 2014 -0800
+++ b/src/share/vm/oops/objArrayKlass.cpp	Mon Mar 03 10:12:07 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);