diff --git a/.hgtags b/.hgtags index faef1bf87d9bd82f984d218195cad77daee3e7db..67eee09e8c1062ed366e93ae7f59883f6488cc92 100644 --- a/.hgtags +++ b/.hgtags @@ -1131,6 +1131,13 @@ c3618e1cdefdda6c262f082791bfd988e0e9d9c9 jdk8u162-b10 39e2895b795aded8b584626fb019d35f12e9d1e7 jdk8u162-b11 69aec2ca5d905dde1d0f29a89076d02a531808a3 jdk8u162-b12 caac74fe3cfa9a8c859c28c97d1046a58252af27 jdk8u162-b31 +c9b7abadf150328d2187de05b9e8a9cba2486e47 jdk8u162-b32 +e8041f2ec96eb6a41307732e6cf6ed90901438ae jdk8u162-b33 +bf2e8b1e8e8e6bc1f9b9475de54ba0329a6b24b1 jdk8u162-b34 +9b3f207379cf6ecfb8603640269e31ff4e064294 jdk8u162-b35 +d2ebd6530396b0afc700cd1a8eaf1f7a7f9fce8d jdk8u162-b36 +700ad8745f3fdc5ba3702616fc5ed6a6248dfa78 jdk8u162-b37 +405800ccc4c7b81475b01392f2145cc3675d1f86 jdk8u162-b38 a17bab9405474602b18cd62e060a09b17d6413ac jdk8u171-b00 ebfd57cc21e6b7f0c22b17c666b6b28c9340e207 jdk8u171-b01 1acd7c1b80241def8fac90f70b0df16356adad47 jdk8u171-b02 @@ -1149,6 +1156,8 @@ d10254debf7c1342416062bf1ba5258f16a8ce00 jdk8u172-b01 653d9e0cd3f4023675c9eece7f0d563287f1d34f jdk8u172-b02 771d9e1fbe1ae2ec4d5d937ebcbfd18e9c800098 jdk8u172-b03 efd7a4e211e8fddf52053d4b033d8d307f356bc3 jdk8u172-b04 +5587cde50bbc2aa031aefb47eaa36b041f5e7c4b jdk8u181-b00 +8f3131e04030eb35434a27c1a0866fc3651af6d5 jdk8u191-b00 4235fb1dceebde1192498ef388a32e56b1ed5a46 jdk8u172-b05 68b234d5df6f01f3c677a114ecd6878c25f23f3c jdk8u172-b06 a311a45523b19d59f77e76b0441a2085bb5355c8 jdk8u172-b07 @@ -1159,6 +1168,16 @@ dcd3ace969fcde4eedaddba629647656289d4264 jdk8u172-b10 6e2be123a2e1c7671086c767e79ffe8ad5d4f9ca jdk8u181-b01 1d0b6fcff115a57ca02081da84589630ba282789 jdk8u181-b02 1127faef22f14d56cdd6c0c8bded598f492c2611 jdk8u181-b03 +d5a33d109309138a1e9bed43d2a2bda04356dbac jdk8u172-b31 +b62c44a689e4d339b1129bffceee94119c84b1b2 jdk8u172-b32 +e8745ad08d55bb56b2ac5a70ec0a972c38fa6ca2 jdk8u172-b33 +74350ee9c013a39acb6af32049599a26e6dc3911 jdk8u172-b34 +0d1b5f9b3ab040eb9023cde206cd67d4b5a54535 jdk8u172-b35 +1e7855b1ecd3d069bcaaf35259d35f79a7c66987 jdk8u172-b36 +6a9482b43d79e3e017f58a23ec4574dd696e04db jdk8u172-b37 +6e2be123a2e1c7671086c767e79ffe8ad5d4f9ca jdk8u181-b01 +1d0b6fcff115a57ca02081da84589630ba282789 jdk8u181-b02 +1127faef22f14d56cdd6c0c8bded598f492c2611 jdk8u181-b03 c53e56e8904926f4efdde8a0483109ed3c60c064 jdk8u181-b04 cea033df30750958ffc999d647ee43587d4a06b2 jdk8u181-b05 2198f5b865507118b644830293dc9f0ec3b4439e jdk8u181-b06 @@ -1169,9 +1188,34 @@ b46904cf3eaf0ca150aee9f0d8bdf85e2691e74f jdk8u181-b09 e4f39d283b55faf6074308797615298bd1a45a66 jdk8u181-b11 464ed8cea5d6cdbfacc9be7035297af88f57f708 jdk8u181-b12 eed8e846c982d7474dd07fc873ba02f83ad1f847 jdk8u181-b13 +21a3fffc43418f4d75c2091bf03478330b8a9a98 jdk8u191-b01 +5aa3d728164a674d08ad847811be6bdd853e9bf8 jdk8u191-b02 +dd79b482625361458b2b34e7d669ee982eee06a4 jdk8u191-b03 +541c205d7fd15ab840f48aaeeaea3f63209d1687 jdk8u191-b04 +14c62eae2f8f56f571abfc8435055bb6094c8440 jdk8u191-b05 +6cfec782c42c25f772bfd51a8b47e6926aa8f69f jdk8u191-b06 +96be5f6ab83349c971edd9aeb35cafce267d3bf8 jdk8u191-b07 +113b4a1676db205922668f5b9c69b3dce22a095e jdk8u191-b08 +a339c1437badce44c7137da58d817159c9c80e4f jdk8u191-b09 +c0bd247ecd1cd09a129040e3fa1745c64db43b35 jdk8u191-b10 +055e1c867479452dd5d8c08905f7475aab25fcc1 jdk8u191-b25 +12e4de4b2499e9d9a1ae4fb0b63ca277cca150f4 jdk8u191-b11 +4fc288749a236f6dd235336a46855a3133f83bde jdk8u191-b12 +ab9258f7206ea8745908e19de159888067939945 jdk8u191-b26 c19c5b73704e3d188bedfe52a473b408ca39009f jdk8u182-b00 0341fa6dbb363ee4dc5dbf5bfc4f820523400a72 jdk8u192-b00 5792d995ed26eec0417d96a2423446bbcd6951a9 jdk8u192-b01 792ccf73293ac2a93cf19cb827d06bcaa896caea jdk8u192-b02 1c0a59cee0e4e680dd0973f022b86de5637b9b75 jdk8u192-b03 1c0a59cee0e4e680dd0973f022b86de5637b9b75 jdk8u202-b00 +a8d61d7f13b0de755da1335c15b72c53c59e92b5 jdk8u192-b04 +65409bcab2ad83d7043d508448a04fe18cf1c262 jdk8u192-b05 +7070edbacb29f03b9a77dbe09425da2c888625f1 jdk8u192-b06 +cd19ee45aa6b6c81dbf981fd71abed7b7888d499 jdk8u192-b07 +c8010d92392ff0081edd6bfd1882ec1f3397a6db jdk8u192-b08 +79ba5ca0aabb29480dd94c6d32d22dceac019700 jdk8u192-b09 +b675533489ae1dc55469885471c9a29eca584d38 jdk8u192-b10 +338c85978b2283a975b762eead2fccc6d25a2bc2 jdk8u192-b25 +8df818c645d6081a387cf4fe9b9c14c0b5b639b1 jdk8u192-b11 +1f822ff877d1a250165d5d2d52faf6957f8fcd00 jdk8u192-b12 +e0e4c3a86ef0e4daf4fe96bd058045a2b13ebf84 jdk8u192-b26 diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index dbed92cdc1eba7ab5d24df89c857f13a7472c689..a1662fe0d0849dd37bfc81f499f1bda58716a758 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1497,7 +1497,7 @@ included with JDK 8 and OpenJDK 8 source distributions. ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.16, which may be +%% This notice is provided with respect to libpng 1.6.35, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1513,21 +1513,21 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.2.5 -with the following individual added to the list of Contributing Authors - - Cosmin Truta - -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-1.0.6 -with the following individuals added to the list of Contributing Authors +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are +derived from libpng-1.0.6, and are distributed according to the same +disclaimer and license as libpng-1.0.6 with the following individuals +added to the list of Contributing Authors: Simon-Pierre Cadieux Eric S. Raymond + Mans Rullgard + Cosmin Truta Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: @@ -1538,19 +1538,25 @@ and with the following additions to the disclaimer: risk of satisfactory quality, performance, accuracy, and effort is with the user. +Some files in the "contrib" directory and some configure-generated +files that are distributed with libpng have other copyright owners and +are released under other open source licenses. + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are -distributed according to the same disclaimer and license as libpng-0.96, -with the following individuals added to the list of Contributing Authors: +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from +libpng-0.96, and are distributed according to the same disclaimer and +license as libpng-0.96, with the following individuals added to the list +of Contributing Authors: Tom Lane Glenn Randers-Pehrson Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are -Copyright (c) 1996, 1997 Andreas Dilger -Distributed according to the same disclaimer and license as libpng-0.88, -with the following individuals added to the list of Contributing Authors: +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, +and are distributed according to the same disclaimer and license as +libpng-0.88, with the following individuals added to the list of +Contributing Authors: John Bowler Kevin Bracey @@ -1559,8 +1565,11 @@ with the following individuals added to the list of Contributing Authors: Greg Roelofs Tom Tanner +Some files in the "scripts" directory have other copyright owners +but are released under this license. + libpng versions 0.5, May 1995, through 0.88, January 1996, are -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: @@ -1583,13 +1592,13 @@ Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: -1. The origin of this source code must not be misrepresented. + 1. The origin of this source code must not be misrepresented. -2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -3. This Copyright notice may not be removed or altered from any - source or altered source distribution. + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. The Contributing Authors and Group 42, Inc. specifically permit, without fee, and encourage the use of this source code as a component to @@ -1597,21 +1606,34 @@ supporting the PNG file format in commercial products. If you use this source code in a product, acknowledgment is not required but would be appreciated. +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. + +TRADEMARK: + +The name "libpng" has not been registered by the Copyright owner +as a trademark in any jurisdiction. However, because libpng has +been distributed and maintained world-wide, continually since 1995, +the Copyright owner claims "common-law trademark protection" in any +jurisdiction where common-law trademark is recognized. -A "png_get_copyright" function is available, for convenient use in "about" -boxes and the like: +OSI CERTIFICATION: - printf("%s",png_get_copyright(NULL)); +Libpng is OSI Certified Open Source Software. OSI Certified Open Source is +a certification mark of the Open Source Initiative. OSI has not addressed +the additional disclaimers inserted at version 1.0.7. -Also, the PNG logo (in PNG format, of course) is supplied in the -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). +EXPORT CONTROL: -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a -certification mark of the Open Source Initiative. +The Copyright owner believes that the Export Control Classification +Number (ECCN) for libpng is EAR99, which means not subject to export +controls or International Traffic in Arms Regulations (ITAR) because +it is open source, publicly available software, that does not contain +any encryption software. See the EAR, paragraphs 734.3(b)(3) and +734.7(b). Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2014 +July 15, 2018 --- end of LICENSE --- diff --git a/src/share/vm/interpreter/linkResolver.cpp b/src/share/vm/interpreter/linkResolver.cpp index e7b6b8c9499f8717ca8055260304f998e34b6467..3a27becd6fd5e4cf220038e0d6f633a8602fb35a 100644 --- a/src/share/vm/interpreter/linkResolver.cpp +++ b/src/share/vm/interpreter/linkResolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -779,37 +779,37 @@ void LinkResolver::resolve_field(fieldDescriptor& fd, KlassHandle resolved_klass THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string()); } - if (!check_access) - // Access checking may be turned off when calling from within the VM. - return; + // Access checking may be turned off when calling from within the VM. + if (check_access) { - // check access - check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK); + // check access + check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK); - // check for errors - if (is_static != fd.is_static()) { - ResourceMark rm(THREAD); - char msg[200]; - jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string()); - THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg); - } + // check for errors + if (is_static != fd.is_static()) { + ResourceMark rm(THREAD); + char msg[200]; + jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string()); + THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg); + } - // Final fields can only be accessed from its own class. - if (is_put && fd.access_flags().is_final() && sel_klass() != current_klass()) { - THROW(vmSymbols::java_lang_IllegalAccessError()); - } + // Final fields can only be accessed from its own class. + if (is_put && fd.access_flags().is_final() && sel_klass() != current_klass()) { + THROW(vmSymbols::java_lang_IllegalAccessError()); + } - // initialize resolved_klass if necessary - // note 1: the klass which declared the field must be initialized (i.e, sel_klass) - // according to the newest JVM spec (5.5, p.170) - was bug (gri 7/28/99) - // - // note 2: we don't want to force initialization if we are just checking - // if the field access is legal; e.g., during compilation - if (is_static && initialize_class) { - sel_klass->initialize(CHECK); + // initialize resolved_klass if necessary + // note 1: the klass which declared the field must be initialized (i.e, sel_klass) + // according to the newest JVM spec (5.5, p.170) - was bug (gri 7/28/99) + // + // note 2: we don't want to force initialization if we are just checking + // if the field access is legal; e.g., during compilation + if (is_static && initialize_class) { + sel_klass->initialize(CHECK); + } } - if (sel_klass() != current_klass()) { + if (sel_klass() != current_klass() && !current_klass.is_null()) { HandleMark hm(THREAD); Handle ref_loader (THREAD, InstanceKlass::cast(current_klass())->class_loader()); Handle sel_loader (THREAD, InstanceKlass::cast(sel_klass())->class_loader()); diff --git a/test/compiler/loopopts/TestCMovSplitThruPhi.java b/test/compiler/loopopts/TestCMovSplitThruPhi.java index 03df3c0b81032ae8f7da3eec121cc9f8bdba9257..86e91342d07037d07b5123cdc99ff719dc213d31 100644 --- a/test/compiler/loopopts/TestCMovSplitThruPhi.java +++ b/test/compiler/loopopts/TestCMovSplitThruPhi.java @@ -25,7 +25,7 @@ * @test * @bug 8187822 * @summary C2 conditonal move optimization might create broken graph - * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi * */