changeset 5486:deddd386e13a

Merge
author asaha
date Tue, 19 Aug 2014 06:50:43 -0700
parents fe122ef372f5 4a7941c7ba44
children 41bd2ed4a2c3
files .hgtags
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 11 19:02:28 2014 -0700
+++ b/.hgtags	Tue Aug 19 06:50:43 2014 -0700
@@ -691,6 +691,7 @@
 1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b19
 c43b0b843f897a4d8cf0a3566b017b87230dd3b4 jdk7u65-b32
 d3c9265e12fa115052f18d1e3d379143b56bbf63 jdk7u65-b20
+39776d90970221dd260187acb4c37631e41a66a9 jdk7u67-b01
 1d8226b3e9896656451801393eb3ae394faeb638 jdk7u65-b40
 cf8b3a090e597e59177c5f67d44cdec12309777f jdk7u65-b31
 df855c3f4d31dd7db081d68e3054518380127893 jdk7u65-b33
@@ -714,6 +715,8 @@
 f95fa655cc119659686ba68c7242497fd209f9e1 jdk7u71-b06
 7f32b65fde34db41bf951ed81374240840ef88f4 jdk7u71-b07
 4e17bd4fb2304d068023d9d805e86d6b592d4230 jdk7u71-b08
+1ffc702334d960aa4015e5cc6f4fb9e971952b54 jdk7u71-b09
+9a17c184bcb99f13dc6ab714ad98976410429637 jdk7u71-b10
 1bd3adac3aac3c29c81303812b35f484ff90cb2b jdk7u72-b01
 0caed46767e35c00eff69b22acf984d98eb66b3d jdk7u72-b02
 3a2934191de4bb8ca9d2faca93f3381e521e8cac jdk7u72-b03
@@ -722,4 +725,6 @@
 4d9d227d70f33b70461230172386217317954312 jdk7u72-b06
 ece56f93f37b41b9c8875e54fbd8010277f6b460 jdk7u72-b07
 439c695a7aa03652ab92681120434b9ce8cdd2b7 jdk7u72-b08
+a27f16d45457a68a723acca621cb11bc173a0eb6 jdk7u72-b09
+e6508ab77271d1d3ce7b5f60d91a7334fdacb03a jdk7u72-b10
 e6b6d91b3934c281086f8efacb0926e7451cc18b jdk7u75-b00
--- a/src/share/vm/oops/typeArrayOop.hpp	Mon Aug 11 19:02:28 2014 -0700
+++ b/src/share/vm/oops/typeArrayOop.hpp	Tue Aug 19 06:50:43 2014 -0700
@@ -162,7 +162,7 @@
     DEBUG_ONLY(BasicType etype = Klass::layout_helper_element_type(lh));
     assert(length <= arrayOopDesc::max_array_length(etype), "no overflow");
 
-    julong size_in_bytes = length;
+    julong size_in_bytes = (juint)length;
     size_in_bytes <<= element_shift;
     size_in_bytes += instance_header_size;
     julong size_in_words = ((size_in_bytes + (HeapWordSize-1)) >> LogHeapWordSize);