Mercurial > hg > truffle

changeset 17857:10e0955f4141

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 27 Mar 2014 14:50:50 -0700
parents 5292c288af34 (diff) f0ea4d3df129 (current diff)
children e6131477d52e
files .hgtags make/hotspot_version src/share/vm/gc_implementation/g1/heapRegionSets.cpp src/share/vm/gc_implementation/g1/heapRegionSets.hpp
diffstat 4 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 25 10:48:42 2014 -0700
+++ b/.hgtags	Thu Mar 27 14:50:50 2014 -0700
@@ -424,6 +424,19 @@
 b5e7ebfe185cb4c2eeb8a919025fc6a26be2fcef jdk8-b131
 9f9179e8f0cfe74c08f3716cf3c38e21e1de4c4a hs25-b70
 0c94c41dcd70e9a9b4d96e31275afd5a73daa72d jdk8-b132
+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
+17a75e692af397532e2b296b24f6b9b6c239c633 jdk8u5-b11
+9b289963cb9a14636fbe8faaa2dd6d3678464a7b jdk8u5-b12
+8a67179106085689906732013a282efeeb9bd5f4 jdk8u5-b13
 412d3b5fe90e54c0ff9d9ac7374b98607c561d5a hs25.20-b01
 4638c4d7ff106db0f29ef7f18b128dd7e69bc470 hs25.20-b02
 e56d11f8cc2158d4280f80e56d196193349c150a hs25.20-b03
--- a/THIRD_PARTY_README	Tue Mar 25 10:48:42 2014 -0700
+++ b/THIRD_PARTY_README	Thu Mar 27 14:50:50 2014 -0700
@@ -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/src/share/vm/classfile/classFileParser.cpp	Tue Mar 25 10:48:42 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu Mar 27 14:50:50 2014 -0700
@@ -2777,6 +2777,11 @@
                      "Short length on BootstrapMethods in class file %s",
                      CHECK);
 
+  guarantee_property(attribute_byte_length > sizeof(u2),
+                     "Invalid BootstrapMethods attribute length %u in class file %s",
+                     attribute_byte_length,
+                     CHECK);
+
   // The attribute contains a counted array of counted tuples of shorts,
   // represending bootstrap specifiers:
   //    length*{bootstrap_method_index, argument_count*{argument_index}}
--- a/src/share/vm/oops/objArrayKlass.cpp	Tue Mar 25 10:48:42 2014 -0700
+++ b/src/share/vm/oops/objArrayKlass.cpp	Thu Mar 27 14:50:50 2014 -0700
@@ -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);