Mercurial > hg > truffle
changeset 18086:18f19f7883f7
Merge
| author | coffeys |
|---|---|
| date | Fri, 25 Jul 2014 14:14:14 +0100 |
| parents | 4f209b7a580c (current diff) 19408d5fd31c (diff) |
| children | 19c692f1e4c5 |
| files | .hgtags make/hotspot_version |
| diffstat | 4 files changed, 23 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 22 01:57:42 2014 -0700 +++ b/.hgtags Fri Jul 25 14:14:14 2014 +0100 @@ -497,6 +497,7 @@ f7429096a202cab5c36a0f20dea33c554026010f jdk8u20-b22 7c56530b11496459e66cb9ea933035002311672c hs25.20-b22 f09d1f6a401e25a54dad44bb7bea482e47558af5 jdk8u20-b23 +00cf2b6f51b9560b01030e8f4c28c466f0b21fe3 hs25.20-b23 a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00 9a2152fbd929b0d8b2f5c326a5526214ae71731a jdk8u25-b01 d3d5604ea0dea3812e87ba76ac199d0a8be6f49f jdk8u25-b02
--- a/THIRD_PARTY_README Tue Jul 22 01:57:42 2014 -0700 +++ b/THIRD_PARTY_README Fri Jul 25 14:14:14 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
--- a/src/os/aix/vm/os_aix.cpp Tue Jul 22 01:57:42 2014 -0700 +++ b/src/os/aix/vm/os_aix.cpp Fri Jul 25 14:14:14 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
--- a/src/share/vm/ci/ciField.cpp Tue Jul 22 01:57:42 2014 -0700 +++ b/src/share/vm/ci/ciField.cpp Fri Jul 25 14:14:14 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); }