Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Tue Oct 16 10:40:23 2018 -0400
     1.2 +++ b/.hgtags	Tue Oct 16 16:08:14 2018 +0100
     1.3 @@ -1131,6 +1131,13 @@
     1.4  39e2895b795aded8b584626fb019d35f12e9d1e7 jdk8u162-b11
     1.5  69aec2ca5d905dde1d0f29a89076d02a531808a3 jdk8u162-b12
     1.6  caac74fe3cfa9a8c859c28c97d1046a58252af27 jdk8u162-b31
     1.7 +c9b7abadf150328d2187de05b9e8a9cba2486e47 jdk8u162-b32
     1.8 +e8041f2ec96eb6a41307732e6cf6ed90901438ae jdk8u162-b33
     1.9 +bf2e8b1e8e8e6bc1f9b9475de54ba0329a6b24b1 jdk8u162-b34
    1.10 +9b3f207379cf6ecfb8603640269e31ff4e064294 jdk8u162-b35
    1.11 +d2ebd6530396b0afc700cd1a8eaf1f7a7f9fce8d jdk8u162-b36
    1.12 +700ad8745f3fdc5ba3702616fc5ed6a6248dfa78 jdk8u162-b37
    1.13 +405800ccc4c7b81475b01392f2145cc3675d1f86 jdk8u162-b38
    1.14  a17bab9405474602b18cd62e060a09b17d6413ac jdk8u171-b00
    1.15  ebfd57cc21e6b7f0c22b17c666b6b28c9340e207 jdk8u171-b01
    1.16  1acd7c1b80241def8fac90f70b0df16356adad47 jdk8u171-b02
    1.17 @@ -1149,6 +1156,8 @@
    1.18  653d9e0cd3f4023675c9eece7f0d563287f1d34f jdk8u172-b02
    1.19  771d9e1fbe1ae2ec4d5d937ebcbfd18e9c800098 jdk8u172-b03
    1.20  efd7a4e211e8fddf52053d4b033d8d307f356bc3 jdk8u172-b04
    1.21 +5587cde50bbc2aa031aefb47eaa36b041f5e7c4b jdk8u181-b00
    1.22 +8f3131e04030eb35434a27c1a0866fc3651af6d5 jdk8u191-b00
    1.23  4235fb1dceebde1192498ef388a32e56b1ed5a46 jdk8u172-b05
    1.24  68b234d5df6f01f3c677a114ecd6878c25f23f3c jdk8u172-b06
    1.25  a311a45523b19d59f77e76b0441a2085bb5355c8 jdk8u172-b07
    1.26 @@ -1159,6 +1168,16 @@
    1.27  6e2be123a2e1c7671086c767e79ffe8ad5d4f9ca jdk8u181-b01
    1.28  1d0b6fcff115a57ca02081da84589630ba282789 jdk8u181-b02
    1.29  1127faef22f14d56cdd6c0c8bded598f492c2611 jdk8u181-b03
    1.30 +d5a33d109309138a1e9bed43d2a2bda04356dbac jdk8u172-b31
    1.31 +b62c44a689e4d339b1129bffceee94119c84b1b2 jdk8u172-b32
    1.32 +e8745ad08d55bb56b2ac5a70ec0a972c38fa6ca2 jdk8u172-b33
    1.33 +74350ee9c013a39acb6af32049599a26e6dc3911 jdk8u172-b34
    1.34 +0d1b5f9b3ab040eb9023cde206cd67d4b5a54535 jdk8u172-b35
    1.35 +1e7855b1ecd3d069bcaaf35259d35f79a7c66987 jdk8u172-b36
    1.36 +6a9482b43d79e3e017f58a23ec4574dd696e04db jdk8u172-b37
    1.37 +6e2be123a2e1c7671086c767e79ffe8ad5d4f9ca jdk8u181-b01
    1.38 +1d0b6fcff115a57ca02081da84589630ba282789 jdk8u181-b02
    1.39 +1127faef22f14d56cdd6c0c8bded598f492c2611 jdk8u181-b03
    1.40  c53e56e8904926f4efdde8a0483109ed3c60c064 jdk8u181-b04
    1.41  cea033df30750958ffc999d647ee43587d4a06b2 jdk8u181-b05
    1.42  2198f5b865507118b644830293dc9f0ec3b4439e jdk8u181-b06
    1.43 @@ -1169,9 +1188,34 @@
    1.44  e4f39d283b55faf6074308797615298bd1a45a66 jdk8u181-b11
    1.45  464ed8cea5d6cdbfacc9be7035297af88f57f708 jdk8u181-b12
    1.46  eed8e846c982d7474dd07fc873ba02f83ad1f847 jdk8u181-b13
    1.47 +21a3fffc43418f4d75c2091bf03478330b8a9a98 jdk8u191-b01
    1.48 +5aa3d728164a674d08ad847811be6bdd853e9bf8 jdk8u191-b02
    1.49 +dd79b482625361458b2b34e7d669ee982eee06a4 jdk8u191-b03
    1.50 +541c205d7fd15ab840f48aaeeaea3f63209d1687 jdk8u191-b04
    1.51 +14c62eae2f8f56f571abfc8435055bb6094c8440 jdk8u191-b05
    1.52 +6cfec782c42c25f772bfd51a8b47e6926aa8f69f jdk8u191-b06
    1.53 +96be5f6ab83349c971edd9aeb35cafce267d3bf8 jdk8u191-b07
    1.54 +113b4a1676db205922668f5b9c69b3dce22a095e jdk8u191-b08
    1.55 +a339c1437badce44c7137da58d817159c9c80e4f jdk8u191-b09
    1.56 +c0bd247ecd1cd09a129040e3fa1745c64db43b35 jdk8u191-b10
    1.57 +055e1c867479452dd5d8c08905f7475aab25fcc1 jdk8u191-b25
    1.58 +12e4de4b2499e9d9a1ae4fb0b63ca277cca150f4 jdk8u191-b11
    1.59 +4fc288749a236f6dd235336a46855a3133f83bde jdk8u191-b12
    1.60 +ab9258f7206ea8745908e19de159888067939945 jdk8u191-b26
    1.61  c19c5b73704e3d188bedfe52a473b408ca39009f jdk8u182-b00
    1.62  0341fa6dbb363ee4dc5dbf5bfc4f820523400a72 jdk8u192-b00
    1.63  5792d995ed26eec0417d96a2423446bbcd6951a9 jdk8u192-b01
    1.64  792ccf73293ac2a93cf19cb827d06bcaa896caea jdk8u192-b02
    1.65  1c0a59cee0e4e680dd0973f022b86de5637b9b75 jdk8u192-b03
    1.66  1c0a59cee0e4e680dd0973f022b86de5637b9b75 jdk8u202-b00
    1.67 +a8d61d7f13b0de755da1335c15b72c53c59e92b5 jdk8u192-b04
    1.68 +65409bcab2ad83d7043d508448a04fe18cf1c262 jdk8u192-b05
    1.69 +7070edbacb29f03b9a77dbe09425da2c888625f1 jdk8u192-b06
    1.70 +cd19ee45aa6b6c81dbf981fd71abed7b7888d499 jdk8u192-b07
    1.71 +c8010d92392ff0081edd6bfd1882ec1f3397a6db jdk8u192-b08
    1.72 +79ba5ca0aabb29480dd94c6d32d22dceac019700 jdk8u192-b09
    1.73 +b675533489ae1dc55469885471c9a29eca584d38 jdk8u192-b10
    1.74 +338c85978b2283a975b762eead2fccc6d25a2bc2 jdk8u192-b25
    1.75 +8df818c645d6081a387cf4fe9b9c14c0b5b639b1 jdk8u192-b11
    1.76 +1f822ff877d1a250165d5d2d52faf6957f8fcd00 jdk8u192-b12
    1.77 +e0e4c3a86ef0e4daf4fe96bd058045a2b13ebf84 jdk8u192-b26

     2.1 --- a/THIRD_PARTY_README	Tue Oct 16 10:40:23 2018 -0400
     2.2 +++ b/THIRD_PARTY_README	Tue Oct 16 16:08:14 2018 +0100
     2.3 @@ -1497,7 +1497,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to libpng 1.6.16, which may be 
     2.8 +%% This notice is provided with respect to libpng 1.6.35, which may be
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1513,21 +1513,21 @@
    2.13  
    2.14  This code is released under the libpng license.
    2.15  
    2.16 -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
    2.17 -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
    2.18 -distributed according to the same disclaimer and license as libpng-1.2.5
    2.19 -with the following individual added to the list of Contributing Authors
    2.20 -
    2.21 -   Cosmin Truta
    2.22 -
    2.23 -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
    2.24 -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
    2.25 -distributed according to the same disclaimer and license as libpng-1.0.6
    2.26 -with the following individuals added to the list of Contributing Authors
    2.27 +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    2.28 +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    2.29 +derived from libpng-1.0.6, and are distributed according to the same
    2.30 +disclaimer and license as libpng-1.0.6 with the following individuals
    2.31 +added to the list of Contributing Authors:
    2.32  
    2.33     Simon-Pierre Cadieux
    2.34     Eric S. Raymond
    2.35 +   Mans Rullgard
    2.36 +   Cosmin Truta
    2.37     Gilles Vollant
    2.38 +   James Yu
    2.39 +   Mandar Sahastrabuddhe
    2.40 +   Google Inc.
    2.41 +   Vadim Barkov
    2.42  
    2.43  and with the following additions to the disclaimer:
    2.44  
    2.45 @@ -1538,19 +1538,25 @@
    2.46     risk of satisfactory quality, performance, accuracy, and effort is with
    2.47     the user.
    2.48  
    2.49 +Some files in the "contrib" directory and some configure-generated
    2.50 +files that are distributed with libpng have other copyright owners and
    2.51 +are released under other open source licenses.
    2.52 +
    2.53  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
    2.54 -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
    2.55 -distributed according to the same disclaimer and license as libpng-0.96,
    2.56 -with the following individuals added to the list of Contributing Authors:
    2.57 +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
    2.58 +libpng-0.96, and are distributed according to the same disclaimer and
    2.59 +license as libpng-0.96, with the following individuals added to the list
    2.60 +of Contributing Authors:
    2.61  
    2.62     Tom Lane
    2.63     Glenn Randers-Pehrson
    2.64     Willem van Schaik
    2.65  
    2.66  libpng versions 0.89, June 1996, through 0.96, May 1997, are
    2.67 -Copyright (c) 1996, 1997 Andreas Dilger
    2.68 -Distributed according to the same disclaimer and license as libpng-0.88,
    2.69 -with the following individuals added to the list of Contributing Authors:
    2.70 +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
    2.71 +and are distributed according to the same disclaimer and license as
    2.72 +libpng-0.88, with the following individuals added to the list of
    2.73 +Contributing Authors:
    2.74  
    2.75     John Bowler
    2.76     Kevin Bracey
    2.77 @@ -1559,8 +1565,11 @@
    2.78     Greg Roelofs
    2.79     Tom Tanner
    2.80  
    2.81 +Some files in the "scripts" directory have other copyright owners
    2.82 +but are released under this license.
    2.83 +
    2.84  libpng versions 0.5, May 1995, through 0.88, January 1996, are
    2.85 -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
    2.86 +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    2.87  
    2.88  For the purposes of this copyright and license, "Contributing Authors"
    2.89  is defined as the following set of individuals:
    2.90 @@ -1583,13 +1592,13 @@
    2.91  source code, or portions hereof, for any purpose, without fee, subject
    2.92  to the following restrictions:
    2.93  
    2.94 -1. The origin of this source code must not be misrepresented.
    2.95 -
    2.96 -2. Altered versions must be plainly marked as such and must not
    2.97 -   be misrepresented as being the original source.
    2.98 -
    2.99 -3. This Copyright notice may not be removed or altered from any
   2.100 -   source or altered source distribution.
   2.101 +  1. The origin of this source code must not be misrepresented.
   2.102 +
   2.103 +  2. Altered versions must be plainly marked as such and must not
   2.104 +     be misrepresented as being the original source.
   2.105 +
   2.106 +  3. This Copyright notice may not be removed or altered from any
   2.107 +     source or altered source distribution.
   2.108  
   2.109  The Contributing Authors and Group 42, Inc. specifically permit, without
   2.110  fee, and encourage the use of this source code as a component to
   2.111 @@ -1597,21 +1606,34 @@
   2.112  source code in a product, acknowledgment is not required but would be
   2.113  appreciated.
   2.114  
   2.115 -
   2.116 -A "png_get_copyright" function is available, for convenient use in "about"
   2.117 -boxes and the like:
   2.118 -
   2.119 -   printf("%s",png_get_copyright(NULL));
   2.120 -
   2.121 -Also, the PNG logo (in PNG format, of course) is supplied in the
   2.122 -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
   2.123 -
   2.124 -Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
   2.125 -certification mark of the Open Source Initiative.
   2.126 +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   2.127 +
   2.128 +TRADEMARK:
   2.129 +
   2.130 +The name "libpng" has not been registered by the Copyright owner
   2.131 +as a trademark in any jurisdiction.  However, because libpng has
   2.132 +been distributed and maintained world-wide, continually since 1995,
   2.133 +the Copyright owner claims "common-law trademark protection" in any
   2.134 +jurisdiction where common-law trademark is recognized.
   2.135 +
   2.136 +OSI CERTIFICATION:
   2.137 +
   2.138 +Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
   2.139 +a certification mark of the Open Source Initiative. OSI has not addressed
   2.140 +the additional disclaimers inserted at version 1.0.7.
   2.141 +
   2.142 +EXPORT CONTROL:
   2.143 +
   2.144 +The Copyright owner believes that the Export Control Classification
   2.145 +Number (ECCN) for libpng is EAR99, which means not subject to export
   2.146 +controls or International Traffic in Arms Regulations (ITAR) because
   2.147 +it is open source, publicly available software, that does not contain
   2.148 +any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
   2.149 +734.7(b).
   2.150  
   2.151  Glenn Randers-Pehrson
   2.152  glennrp at users.sourceforge.net
   2.153 -December 22, 2014
   2.154 +July 15, 2018
   2.155  
   2.156  --- end of LICENSE ---
   2.157  

     3.1 --- a/src/share/vm/interpreter/linkResolver.cpp	Tue Oct 16 10:40:23 2018 -0400
     3.2 +++ b/src/share/vm/interpreter/linkResolver.cpp	Tue Oct 16 16:08:14 2018 +0100
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -779,37 +779,37 @@
    3.11      THROW_MSG(vmSymbols::java_lang_NoSuchFieldError(), field->as_C_string());
    3.12    }
    3.13  
    3.14 -  if (!check_access)
    3.15 -    // Access checking may be turned off when calling from within the VM.
    3.16 -    return;
    3.17 +  // Access checking may be turned off when calling from within the VM.
    3.18 +  if (check_access) {
    3.19  
    3.20 -  // check access
    3.21 -  check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK);
    3.22 +    // check access
    3.23 +    check_field_accessability(current_klass, resolved_klass, sel_klass, fd, CHECK);
    3.24  
    3.25 -  // check for errors
    3.26 -  if (is_static != fd.is_static()) {
    3.27 -    ResourceMark rm(THREAD);
    3.28 -    char msg[200];
    3.29 -    jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string());
    3.30 -    THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg);
    3.31 +    // check for errors
    3.32 +    if (is_static != fd.is_static()) {
    3.33 +      ResourceMark rm(THREAD);
    3.34 +      char msg[200];
    3.35 +      jio_snprintf(msg, sizeof(msg), "Expected %s field %s.%s", is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string());
    3.36 +      THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg);
    3.37 +    }
    3.38 +
    3.39 +    // Final fields can only be accessed from its own class.
    3.40 +    if (is_put && fd.access_flags().is_final() && sel_klass() != current_klass()) {
    3.41 +      THROW(vmSymbols::java_lang_IllegalAccessError());
    3.42 +    }
    3.43 +
    3.44 +    // initialize resolved_klass if necessary
    3.45 +    // note 1: the klass which declared the field must be initialized (i.e, sel_klass)
    3.46 +    //         according to the newest JVM spec (5.5, p.170) - was bug (gri 7/28/99)
    3.47 +    //
    3.48 +    // note 2: we don't want to force initialization if we are just checking
    3.49 +    //         if the field access is legal; e.g., during compilation
    3.50 +    if (is_static && initialize_class) {
    3.51 +      sel_klass->initialize(CHECK);
    3.52 +    }
    3.53    }
    3.54  
    3.55 -  // Final fields can only be accessed from its own class.
    3.56 -  if (is_put && fd.access_flags().is_final() && sel_klass() != current_klass()) {
    3.57 -    THROW(vmSymbols::java_lang_IllegalAccessError());
    3.58 -  }
    3.59 -
    3.60 -  // initialize resolved_klass if necessary
    3.61 -  // note 1: the klass which declared the field must be initialized (i.e, sel_klass)
    3.62 -  //         according to the newest JVM spec (5.5, p.170) - was bug (gri 7/28/99)
    3.63 -  //
    3.64 -  // note 2: we don't want to force initialization if we are just checking
    3.65 -  //         if the field access is legal; e.g., during compilation
    3.66 -  if (is_static && initialize_class) {
    3.67 -    sel_klass->initialize(CHECK);
    3.68 -  }
    3.69 -
    3.70 -  if (sel_klass() != current_klass()) {
    3.71 +  if (sel_klass() != current_klass() && !current_klass.is_null()) {
    3.72      HandleMark hm(THREAD);
    3.73      Handle ref_loader (THREAD, InstanceKlass::cast(current_klass())->class_loader());
    3.74      Handle sel_loader (THREAD, InstanceKlass::cast(sel_klass())->class_loader());

     4.1 --- a/test/compiler/loopopts/TestCMovSplitThruPhi.java	Tue Oct 16 10:40:23 2018 -0400
     4.2 +++ b/test/compiler/loopopts/TestCMovSplitThruPhi.java	Tue Oct 16 16:08:14 2018 +0100
     4.3 @@ -25,7 +25,7 @@
     4.4   * @test
     4.5   * @bug 8187822
     4.6   * @summary C2 conditonal move optimization might create broken graph
     4.7 - * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
     4.8 + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestCMovSplitThruPhi::not_inlined -XX:CompileOnly=TestCMovSplitThruPhi::test -XX:-LoopUnswitching TestCMovSplitThruPhi
     4.9   *
    4.10   */
    4.11