Mercurial > hg > graal-jvmci-8

changeset 17539:b90de55aca30 jdk8u11-b00 jdk8u5-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Fri, 17 Jan 2014 22:36:51 -0800
parents 66ae48d0f855 (diff) e2e6ca7e0ea6 (current diff)
children 2bac854670c0 27be1cc8329c
files .hgtags make/hotspot_version
diffstat 4 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jan 17 15:52:59 2014 -0800
+++ b/.hgtags	Fri Jan 17 22:36:51 2014 -0800
@@ -410,3 +410,7 @@
 591135a7d6f96c0ef281d078cee9a8d8c342d45c jdk8-b123
 9b9816164447214f21b06ccf646893c281c76a42 hs25-b66
 df333ee12bba67e2e928f8ce1da37afd9bf95b48 jdk8-b124
+4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
+e5561d89fe8bfc79cd6c8fcc36d270cc6a49ec6e jdk8u5-b02
+2f9eb9fcab6c42c8c84ddb44170ea33235116d84 jdk8u5-b03
+5ac720d47ab83f8eb2f5fe3641667823a0298f41 jdk8u5-b04
--- a/.jcheck/conf	Fri Jan 17 15:52:59 2014 -0800
+++ b/.jcheck/conf	Fri Jan 17 22:36:51 2014 -0800
@@ -1,1 +1,2 @@
 project=jdk8
+bugids=dup
--- a/make/hotspot_version	Fri Jan 17 15:52:59 2014 -0800
+++ b/make/hotspot_version	Fri Jan 17 22:36:51 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_MINOR_VER=5
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/src/share/vm/oops/objArrayKlass.cpp	Fri Jan 17 15:52:59 2014 -0800
+++ b/src/share/vm/oops/objArrayKlass.cpp	Fri Jan 17 22:36:51 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);