# HG changeset patch
# User coffeys
# Date 1406887482 -3600
# Node ID 6e7f1382ca62a1803af9dd5dfd72af782bbd5282
# Parent  1c198f9c88548db8ab76e75bff8f9b3c3c8ab953# Parent  9e2bb00a81910776d5b16c49a3f4c5264ceab522
Merge

diff -r 1c198f9c8854 -r 6e7f1382ca62 .hgtags
--- a/.hgtags	Tue Jul 22 10:39:18 2014 -0700
+++ b/.hgtags	Fri Aug 01 11:04:42 2014 +0100
@@ -497,6 +497,10 @@
 f7429096a202cab5c36a0f20dea33c554026010f jdk8u20-b22
 7c56530b11496459e66cb9ea933035002311672c hs25.20-b22
 f09d1f6a401e25a54dad44bb7bea482e47558af5 jdk8u20-b23
+42ddd0bbcb6630fe463ec9bc1893c838d5edff1b jdk8u20-b24
+00cf2b6f51b9560b01030e8f4c28c466f0b21fe3 hs25.20-b23
+19408d5fd31c25ce60c43dd33e92b96e8df4a4ea jdk8u20-b25
+eaa4074a7e3975cd33ec55e6b584586e2ac681bd jdk8u20-b26
 a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00
 9a2152fbd929b0d8b2f5c326a5526214ae71731a jdk8u25-b01
 d3d5604ea0dea3812e87ba76ac199d0a8be6f49f jdk8u25-b02
@@ -506,4 +510,6 @@
 605df8463453628df49351fa63632666f18698cd jdk8u25-b06
 520188d4bade17dbe75163d1f635c08168ea560c jdk8u25-b07
 f3f50c4f9ea5d3af40cb794b6f3f2a337c8873db jdk8u25-b08
+4f209b7a580c78bac255e69f4724c42584c32a7d jdk8u25-b09
+19c692f1e4c571a9285e33e7d3d15948769fcbdd jdk8u25-b10
 5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
diff -r 1c198f9c8854 -r 6e7f1382ca62 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Tue Jul 22 10:39:18 2014 -0700
+++ b/THIRD_PARTY_README	Fri Aug 01 11:04:42 2014 +0100
@@ -2,7 +2,7 @@
 -----------------------------
 
 %% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
+Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
 OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1471,7 +1471,7 @@
 version 2.0.
 
 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.
 
 The NSS source code is available in the OpenJDK source code repository at:
     jdk/test/sun/security/pkcs11/nss/src
@@ -3349,14 +3349,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.5, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -3382,11 +3382,11 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
-  Apache Jakarta BCEL 5.2 
+included with JRE 8, JDK 8, and OpenJDK 8.
+
+  Apache Commons Math 3.2
+  Apache Derby 10.10.1.3        
+  Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4
   Apache Xalan-Java 2.7.1 
diff -r 1c198f9c8854 -r 6e7f1382ca62 make/hotspot_version
diff -r 1c198f9c8854 -r 6e7f1382ca62 src/os/aix/vm/os_aix.cpp
--- a/src/os/aix/vm/os_aix.cpp	Tue Jul 22 10:39:18 2014 -0700
+++ b/src/os/aix/vm/os_aix.cpp	Fri Aug 01 11:04:42 2014 +0100
@@ -1215,10 +1215,6 @@
   ::abort();
 }
 
-// Unused on Aix for now.
-void os::set_error_file(const char *logfile) {}
-
-
 // This method is a copy of JDK's sysGetLastErrorString
 // from src/solaris/hpi/src/system_md.c
 
diff -r 1c198f9c8854 -r 6e7f1382ca62 src/share/vm/ci/ciField.cpp
--- a/src/share/vm/ci/ciField.cpp	Tue Jul 22 10:39:18 2014 -0700
+++ b/src/share/vm/ci/ciField.cpp	Fri Aug 01 11:04:42 2014 +0100
@@ -138,6 +138,17 @@
     return;
   }
 
+  // Access check based on declared_holder. canonical_holder should not be used
+  // to check access because it can erroneously succeed. If this check fails,
+  // propagate the declared holder to will_link() which in turn will bail out
+  // compilation for this field access.
+  if (!Reflection::verify_field_access(klass->get_Klass(), declared_holder->get_Klass(), canonical_holder, field_desc.access_flags(), true)) {
+    _holder = declared_holder;
+    _offset = -1;
+    _is_constant = false;
+    return;
+  }
+
   assert(canonical_holder == field_desc.field_holder(), "just checking");
   initialize_from(&field_desc);
 }