Merge

3 files changed, 139 insertions, 39 deletions

diff --git a/.hgtags b/.hgtags
index 9639a406..f5e61df3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -864,6 +864,51 @@ a34491682a8438f370ca7b5181b3827f148e9af1 jdk8u162-b08
 0a93e6a9934e9e81e96b74e11402793026abfe55 jdk8u162-b11
 3f877d379c48178a1203089ea56b4e8061689b5d jdk8u162-b12
 3c567ee8d853375cafa61378ab890bb4e82d98c2 jdk8u162-b31
+59508dc01b26fa97854f4fed3ae466e3e3eb3a3e jdk8u162-b32
+4eff9c0f63f007c22495a4d4ab5c295499554855 jdk8u162-b33
+e6b190611af9e2b56270d45fdabb863ece49b600 jdk8u162-b34
+3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
+8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
+710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
+0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
+801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
+3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
+8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
+e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
+93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
+9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u181-b00
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
+0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
+801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
+bb41125356006139d5e56a1c67a55779a42a5a9e jdk8u171-b06
+059028cb56528c8f1673497ad52f847b28eba43a jdk8u171-b07
+fd005fcf00fe65dad4b86508a5cd2ea5c627acd5 jdk8u171-b08
+9d9a43a064fc3db9a65a41accf707fc43605955f jdk8u171-b09
+e9b4feb9ed6ac7d8d620b162f8780f8470b21711 jdk8u171-b10
+921be31addf6c9fda681af76bec704780e5f2084 jdk8u171-b11
+3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
+8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
+e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
+93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
+9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
+c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
+bb62c7f3b3edf266edd5d093418958f1dc909ce7 jdk8u172-b06
+b14b138cc741dfb9980896516468a95c8c290cd7 jdk8u172-b07
+32ba142b2880976087c6da77cc32e58a5d0e8798 jdk8u172-b08
+1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
+3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
+df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
+8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
+51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
+4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
+5a0b8cd7f9b5cd6099bf7c0536bd114dd4cbf545 jdk8u191-b00
+c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
+7ea9b82890105406d1ac7316b28559ccc05768c0 jdk8u162-b35
+7de7950c0351ccd6f82787090b78c16b0384b90c jdk8u162-b36
+4aac2244c3a94ab41a583a7570b195f3f638069c jdk8u162-b37
+4c81e132698244f1b7f93a4d2c3d872dbb24bbc4 jdk8u162-b38
 3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
 8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
 710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
@@ -889,6 +934,13 @@ b14b138cc741dfb9980896516468a95c8c290cd7 jdk8u172-b07
 1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
 3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
 df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
+1ade28deec4a0a92e4ee1d743fbd88594d2b033a jdk8u172-b31
+228f8e1dceb069247fad31d08baf61d7a57236a8 jdk8u172-b32
+8c6bd9d0cf71f8014a6c4840a051068660128a3c jdk8u172-b33
+fbb5a1798b866f62862e7b76f340fd9882f325e1 jdk8u172-b34
+7b299af843c764a53e38ffaca7b307cce64ca4e8 jdk8u172-b35
+2a333371ef73230759cd207b3ed544331ed6b7e5 jdk8u172-b36
+28cbe440b3c42aa68cff042394ecf3a805e1b569 jdk8u172-b37
 8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
 51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
 4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
@@ -902,9 +954,34 @@ b4549dc6d358429da7d6292600865d8915140944 jdk8u181-b08
 381f2224e3c3eadc2e3bfaf81d43be2d1f8078b9 jdk8u181-b11
 6372ac5af37ae40a4875c6cdf5c28aeb2a701899 jdk8u181-b12
 3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13
+4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01
+9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u191-b02
+1d23567f6ea387f9e047dd0d81f303b6371a27fb jdk8u191-b03
+c374c805e6fb531f05ffd5070a148633c6f0626a jdk8u191-b04
+755288b11f2e8e9d59eb9149d65995b37bd4c9d7 jdk8u191-b05
+5fa57cd058f2c5b0ad03581295decdbdea455eb3 jdk8u191-b06
+878e65541b35df77127fccaf31397b981c9fa15e jdk8u191-b07
+c25dc7436704829b04a1d8803dfd4f3b88ec9f06 jdk8u191-b08
+a449d7e3eb3432c6ae9edcb30380c8f2a9fae45e jdk8u191-b09
+0fcd632be9e7a67f17002adab0a9a03373f5c481 jdk8u191-b10
+3388cb0fad9c8654cd6499835cbc190c8dbf2441 jdk8u191-b25
+e6205ecef830a71d73a14d1f18765cf4c3ac7773 jdk8u191-b11
+5a2c3b3dd9199561a1d4ba4a4b3bdfd7c6f69736 jdk8u191-b12
+a53a027482b082dbecbdae9bb469fcd957d73900 jdk8u191-b26
 5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00
 a57083d7fe9ac674c0841db6849140424bb16eef jdk8u192-b00
 bc4618963547efc17931174f57bea387f89cd5e9 jdk8u192-b01
 1087a0aaf6a1e7f4c7708a7829b62c8a70b53782 jdk8u192-b02
 ab21284e5eaa5d6e521f679603efb56237f2286e jdk8u192-b03
 ab21284e5eaa5d6e521f679603efb56237f2286e jdk8u202-b00
+2056d0c035e847b13083d4cf63d1003174e6b0d9 jdk8u192-b04
+0d65cee9040926c0625b34e00450551f37042dc5 jdk8u192-b05
+b1dfea491c0571cd5ffb21b3b0778ff90b9efafe jdk8u192-b06
+d42d488fd8dcbe13c05958fd2b98696572157ee1 jdk8u192-b07
+9d1371fc0987c02d1321d7263d88a782e5e5cdfa jdk8u192-b08
+456c0d45c43bfbb5414b9ae0ca68227132b4af7b jdk8u192-b09
+e58a7b05e786554d3447c3b04b11873314b549cd jdk8u192-b10
+aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25
+9d6b5362a75ddef6ed30fe9892e95d7cfdff0ed8 jdk8u192-b11
+854c8339d414bc20aa3c7603ad273aef5d668cde jdk8u192-b12
+6aeb5e07e2bb8f64ee1d8f0651a2723f3a49e834 jdk8u192-b26
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index dbed92cd..a1662fe0 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/jdk/nashorn/internal/objects/Global.java b/src/jdk/nashorn/internal/objects/Global.java
index 85a6a304..18505f00 100644
--- a/src/jdk/nashorn/internal/objects/Global.java
+++ b/src/jdk/nashorn/internal/objects/Global.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -1427,13 +1427,14 @@ public final class Global extends Scope {
             }
         }
 
-        switch (nameStr) {
-        case "context":
+        if ("context".equals(nameStr)) {
             return sctxt;
-        case "engine":
-            return global.engine;
-        default:
-            break;
+        } else if ("engine".equals(nameStr)) {
+            // expose "engine" variable only when there is no security manager
+            // or when no class filter is set.
+            if (System.getSecurityManager() == null || global.getClassFilter() == null) {
+                return global.engine;
+            }
         }
 
         if (self == UNDEFINED) {