Mercurial > hg > icedtea8-forest > nashorn

changeset 2610:1d70dcb4ab53 icedtea-3.16.0 icedtea-3.17.0pre00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u252-ga
author andrew
date Tue, 21 Apr 2020 23:47:25 +0100
parents d76a10678f80 (current diff) 13db9dac5175 (diff)
children 8ebf92f04b9e
files .hgtags
diffstat 5 files changed, 145 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 20 18:11:40 2020 +0100
+++ b/.hgtags	Tue Apr 21 23:47:25 2020 +0100
@@ -1126,3 +1126,13 @@
 04210bbb67cdb97bb7ee8f699822fcce487dac5e icedtea-3.16.0pre00
 191f7b51899b59c104f0ec3fc135cf50bf836e99 jdk8u252-b00
 e854df08e55fbad6d30f43cfcf56be0a489f52c6 icedtea-3.16.0pre01
+7487b6f12a01cd9596f80b49440859aa33ba4890 jdk8u252-b01
+bbf9c324a735c6b9f95fedc61803346ef93b27f2 jdk8u252-b02
+91381cf36ea49a3e08b10971160f714a6bf71dfd jdk8u252-b03
+e767af0b6500d829977e23cfb3fe19f28a4e9f88 jdk8u252-b04
+7fd34fff5c4418b869b96c6f3c1f9fd632590a5b jdk8u252-b05
+b988f627520c45015f0b91d2ee35e69531300770 jdk8u252-b06
+0666ec7fe2b45353dc0e09c1f6f386bdf763eeb4 jdk8u252-b07
+95d61d0f326bbfaddc2cbd29e67b12c00041caaa jdk8u252-b08
+2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-b09
+2f5ad880fd3372eb5c2e5ac5ee82c705a1b6ac07 jdk8u252-ga
--- a/THIRD_PARTY_README	Mon Apr 20 18:11:40 2020 +0100
+++ b/THIRD_PARTY_README	Tue Apr 21 23:47:25 2020 +0100
@@ -1712,10 +1712,9 @@
 
 --- begin of LICENSE ---
 
- Mesa 3-D graphics library
- Version:  5.0
-
- Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ Mesa 3-D Graphics Library v19.2.1
+
+ Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
 
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
@@ -1730,9 +1729,118 @@
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+Mesa Component Licenses
+
+
+
+Component         Location               License
+------------------------------------------------------------------
+Main Mesa code    src/mesa/              MIT
+Device drivers    src/mesa/drivers/*     MIT, generally
+
+Gallium code      src/gallium/           MIT
+
+Ext headers       GL/glext.h             Khronos
+                  GL/glxext.h            Khronos
+                  GL/wglext.h            Khronos
+                  KHR/khrplatform.h      Khronos
+
+*****************************************************************************
+
+----
+include/GL/gl.h :
+
+
+ Mesa 3-D graphics library
+
+ Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ 
+ *****************************************************************************
+
+----
+include/GL/glext.h
+include/GL/glxext.h
+include/GL/wglxext.h :
+
+
+ Copyright (c) 2013 - 2018 The Khronos Group Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and/or associated documentation files (the
+ "Materials"), to deal in the Materials without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Materials, and to
+ permit persons to whom the Materials are furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Materials.
+
+ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+ *****************************************************************************
+
+----
+include/KHR/khrplatform.h :
+
+ Copyright (c) 2008 - 2018 The Khronos Group Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and/or associated documentation files (the
+ "Materials"), to deal in the Materials without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Materials, and to
+ permit persons to whom the Materials are furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Materials.
+
+ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+ *****************************************************************************
 
 --- end of LICENSE ---
 
--- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Mon Apr 20 18:11:40 2020 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java	Tue Apr 21 23:47:25 2020 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, 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
@@ -141,14 +141,14 @@
             throw new PatternSyntaxException(e.getMessage(), string, scanner.position);
         }
 
-        scanner.processForwardReferences();
-
         // Throw syntax error unless we parsed the entire JavaScript regexp without syntax errors
         if (scanner.position != string.length()) {
             final String p = scanner.getStringBuilder().toString();
             throw new PatternSyntaxException(string, p, p.length() + 1);
         }
 
+        scanner.processForwardReferences();
+
         return scanner;
     }
 
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java	Mon Apr 20 18:11:40 2020 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java	Tue Apr 21 23:47:25 2020 +0100
@@ -452,7 +452,7 @@
     private Node parseExp(final TokenType term) {
         if (token.type == term)
          {
-            return StringNode.EMPTY; // goto end_of_token
+            return StringNode.createEmpty(); // goto end_of_token
         }
 
         Node node = null;
@@ -461,7 +461,7 @@
         switch(token.type) {
         case ALT:
         case EOT:
-            return StringNode.EMPTY; // end_of_token:, node_new_empty
+            return StringNode.createEmpty(); // end_of_token:, node_new_empty
 
         case SUBEXP_OPEN:
             node = parseEnclose(TokenType.SUBEXP_CLOSE);
@@ -569,7 +569,7 @@
                 if (syntax.contextInvalidRepeatOps()) {
                     throw new SyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
                 }
-                node = StringNode.EMPTY; // node_new_empty
+                node = StringNode.createEmpty(); // node_new_empty
             } else {
                 return parseExpTkByte(group); // goto tk_byte
             }
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java	Mon Apr 20 18:11:40 2020 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java	Tue Apr 21 23:47:25 2020 +0100
@@ -27,7 +27,6 @@
 
     private static final int NODE_STR_MARGIN = 16;
     private static final int NODE_STR_BUF_SIZE = 24;
-    public static final StringNode EMPTY = new StringNode(null, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
     public char[] chars;
     public int p;
@@ -36,7 +35,13 @@
     public int flag;
 
     public StringNode() {
-        this.chars = new char[NODE_STR_BUF_SIZE];
+        this(NODE_STR_BUF_SIZE);
+    }
+
+    private StringNode(int size) {
+        this.chars = new char[size];
+        this.p = 0;
+        this.end = 0;
     }
 
     public StringNode(final char[] chars, final int p, final int end) {
@@ -51,6 +56,13 @@
         chars[end++] = c;
     }
 
+    /**
+     * Create a new empty StringNode.
+     */
+    public static StringNode createEmpty() {
+        return new StringNode(0);
+    }
+
     /* Ensure there is ahead bytes available in node's buffer
      * (assumes that the node is not shared)
      */