Directly pass Lexer for string interning.

Author: woess

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/Lexer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -80,7 +80,7 @@
  * Responsible for converting source content into a stream of tokens.
  */
 @SuppressWarnings("fallthrough")
-public class Lexer extends Scanner {
+public class Lexer extends Scanner implements StringPool {
     private static final boolean XML_LITERALS = Options.getBooleanProperty("lexer.xmlliterals");
 
     private static final String MSG_EDIT_STRING_MISSING_BRACE = "edit.string.missing.brace";
@@ -2131,6 +2131,7 @@ public TruffleString valueOfRawString(final long token) {
         return stringIntern(sb.toString());
     }
 
+    @Override
     public TruffleString stringIntern(TruffleString candidate) {
         TruffleString interned = internedStrings.putIfAbsent(candidate.toJavaStringUncached(), candidate);
         return interned == null ? candidate : interned;

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/Parser.java

@@ -649,7 +649,7 @@ public FunctionNode parseFunctionBody(boolean generator, boolean async) {
                 addFunctionDeclarations(function);
             } finally {
                 functionDeclarations = null;
-                function.finishBodyScope(lexer::stringIntern);
+                function.finishBodyScope(lexer);
                 restoreBlock(body);
                 lc.pop(function);
             }
@@ -1197,7 +1197,7 @@ private FunctionNode program(final TruffleString scriptName, final int parseFlag
             addFunctionDeclarations(script);
         } finally {
             functionDeclarations = null;
-            script.finishBodyScope(lexer::stringIntern);
+            script.finishBodyScope(lexer);
             restoreBlock(body);
             lc.pop(script);
         }
@@ -2166,7 +2166,7 @@ private Pair<FunctionNode, Boolean> fieldInitializer(int lineNumber, long fieldT
         try {
             initializer = assignmentExpression(true, false, false);
         } finally {
-            function.finishBodyScope(lexer::stringIntern);
+            function.finishBodyScope(lexer);
             restoreBlock(body);
             lc.propagateFunctionFlags();
             lc.pop(function);
@@ -5757,7 +5757,7 @@ private Block functionBody(final ParserContextFunctionNode functionNode) {
                 expect(RBRACE);
             }
         } finally {
-            functionNode.finishBodyScope(lexer::stringIntern);
+            functionNode.finishBodyScope(lexer);
             restoreBlock(body);
             lc.propagateFunctionFlags();
         }

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/ParserContextFunctionNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,7 +44,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 
 import com.oracle.js.parser.ir.Block;
 import com.oracle.js.parser.ir.Expression;
@@ -555,9 +554,9 @@ private void putFunctionSymbolIfAbsent(String bindingName, TruffleString binding
         }
     }
 
-    public void finishBodyScope(Function<TruffleString, TruffleString> stringIntern) {
+    public void finishBodyScope(StringPool strings) {
         if (needsArguments()) {
-            putFunctionSymbolIfAbsent(Parser.ARGUMENTS_NAME, stringIntern.apply(Parser.ARGUMENTS_NAME_TS), Symbol.IS_ARGUMENTS);
+            putFunctionSymbolIfAbsent(Parser.ARGUMENTS_NAME, strings.stringIntern(Parser.ARGUMENTS_NAME_TS), Symbol.IS_ARGUMENTS);
         }
         if (hoistableBlockFunctionDeclarations != null) {
             declareHoistedBlockFunctionDeclarations();
@@ -571,13 +570,13 @@ public void finishBodyScope(Function<TruffleString, TruffleString> stringIntern)
         if (!isArrow()) {
             boolean needsThisForEval = hasEval() || hasArrowEval();
             if (usesThis() || usesSuper() || needsThisForEval || getFlag(FunctionNode.HAS_DIRECT_SUPER) != 0) {
-                putFunctionSymbolIfAbsent(TokenType.THIS.getName(), stringIntern.apply(TokenType.THIS.getNameTS()), Symbol.IS_THIS);
+                putFunctionSymbolIfAbsent(TokenType.THIS.getName(), strings.stringIntern(TokenType.THIS.getNameTS()), Symbol.IS_THIS);
             }
             if (usesSuper() || (isMethod() && needsThisForEval)) {
-                putFunctionSymbolIfAbsent(TokenType.SUPER.getName(), stringIntern.apply(TokenType.SUPER.getNameTS()), Symbol.IS_SUPER);
+                putFunctionSymbolIfAbsent(TokenType.SUPER.getName(), strings.stringIntern(TokenType.SUPER.getNameTS()), Symbol.IS_SUPER);
             }
             if (usesNewTarget() || needsThisForEval) {
-                putFunctionSymbolIfAbsent(Parser.NEW_TARGET_NAME, stringIntern.apply(Parser.NEW_TARGET_NAME_TS), Symbol.IS_NEW_TARGET);
+                putFunctionSymbolIfAbsent(Parser.NEW_TARGET_NAME, strings.stringIntern(Parser.NEW_TARGET_NAME_TS), Symbol.IS_NEW_TARGET);
             }
         }
         if (hasParameterExpressions()) {

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/StringPool.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must 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.
+ */
+package com.oracle.js.parser;
+
+import com.oracle.truffle.api.strings.TruffleString;
+
+public interface StringPool {
+    TruffleString stringIntern(TruffleString candidate);
+}