[aarch64-port-dev ] Two HotSpot patches for OpenJDK 7 from upstream

[Andrew Haley]

Applied to our 7u tree.

Andrew.


changeset:   6752:31a3c2c8a1bb
user:        hseigel
date:        Thu Feb 20 13:11:23 2014 -0500
summary:     8034926: Attribute classes properly

diff -r f6121012b666 -r 31a3c2c8a1bb src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp        Fri May 30 11:58:53 2014 -0400
+++ b/src/share/vm/classfile/classFileParser.cpp        Thu Feb 20 13:11:23 2014 -0500
@@ -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}}

changeset:   6753:360d11d249a6
tag:         tip
user:        dsimms
date:        Fri Jan 10 15:58:40 2014 +0100
summary:     8029858: Enhance array copies

diff -r 31a3c2c8a1bb -r 360d11d249a6 src/share/vm/oops/objArrayKlass.cpp
--- a/src/share/vm/oops/objArrayKlass.cpp       Thu Feb 20 13:11:23 2014 -0500
+++ b/src/share/vm/oops/objArrayKlass.cpp       Fri Jan 10 15:58:40 2014 +0100
@@ -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);