[GR-43440] Minor fixes: remove dead code, all lambdas in PBytecodeRootNode as field, mx graalpytest.

PullRequest: graalpython/3283

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -395,6 +395,8 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
     private static final NodeSupplier<FloatBuiltins.PowNode> NODE_FLOAT_POW = FloatBuiltins.PowNode::create;
     private static final NodeSupplier<HashingStorageFromListSequenceStorageNode> NODE_HASHING_STORAGE_FROM_SEQUENCE = HashingStorageFromListSequenceStorageNode::create;
     private static final NodeSupplier<MatchClassNode> NODE_MATCH_CLASS = MatchClassNode::create;
+    private static final IntNodeFunction<ListFromStackNode> LIST_FROM_STACK_NODE = ListFromStackNodeGen::create;
+    private static final IntNodeFunction<TupleFromStackNode> TUPLE_FROM_STACK_NODE = TupleFromStackNodeGen::create;
 
     private static final IntNodeFunction<UnaryOpNode> UNARY_OP_FACTORY = (int op) -> {
         switch (op) {
@@ -5570,13 +5572,13 @@ private int bytecodeCollectionFromStack(VirtualFrame virtualFrame, int type, int
         Object res = null;
         switch (type) {
             case CollectionBits.KIND_LIST: {
-                ListFromStackNode storageFromStackNode = insertChildNodeInt(localNodes, nodeIndex, ListFromStackNodeGen.class, ListFromStackNodeGen::create, count);
+                ListFromStackNode storageFromStackNode = insertChildNodeInt(localNodes, nodeIndex, ListFromStackNodeGen.class, LIST_FROM_STACK_NODE, count);
                 SequenceStorage store = storageFromStackNode.execute(virtualFrame, stackTop - count + 1, stackTop + 1);
                 res = factory.createList(store, storageFromStackNode);
                 break;
             }
             case CollectionBits.KIND_TUPLE: {
-                TupleFromStackNode storageFromStackNode = insertChildNodeInt(localNodes, nodeIndex, TupleFromStackNodeGen.class, TupleFromStackNodeGen::create, count);
+                TupleFromStackNode storageFromStackNode = insertChildNodeInt(localNodes, nodeIndex, TupleFromStackNodeGen.class, TUPLE_FROM_STACK_NODE, count);
                 SequenceStorage store = storageFromStackNode.execute(virtualFrame, stackTop - count + 1, stackTop + 1);
                 res = factory.createTuple(store);
                 break;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/PythonTernaryBuiltinNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -45,9 +45,5 @@
 
 public abstract class PythonTernaryBuiltinNode extends PythonBuiltinBaseNode {
 
-    public Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3) {
-        return execute1(frame, arg, arg2, arg3);
-    }
-
-    protected abstract Object execute1(VirtualFrame frame, Object arg, Object arg2, Object arg3);
+    public abstract Object execute(VirtualFrame frame, Object arg, Object arg2, Object arg3);
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NativeLibrary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -250,7 +250,7 @@ private Object loadLibrary(PythonContext context) {
             throw new RuntimeException(String.format(
                             "Cannot load supporting native library '%s' because the native access is not allowed. " +
                                             "The native access should be allowed when running GraalPython via the graalpython command. " +
-                                            "If you are embedding GraalPython using the Context API, make sure to allow native access using 'allowNativeAccess(true)'. %s",
+                                            "If you are embedding GraalPy using the Context API, make sure to allow native access using 'allowNativeAccess(true)'. %s",
                             name,
                             noNativeAccessHelp));
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -177,7 +177,7 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "Equivalent to the Python -B flag. Don't write bytecode files.", usageSyntax = "true|false", stability = OptionStability.STABLE) //
     public static final OptionKey<Boolean> DontWriteBytecodeFlag = new OptionKey<>(true);
 
-    @Option(category = OptionCategory.USER, help = "If this is set, GraalPython will write .pyc files in a mirror directory tree at this path, " +
+    @Option(category = OptionCategory.USER, help = "If this is set, GraalPy will write .pyc files in a mirror directory tree at this path, " +
                     "instead of in __pycache__ directories within the source tree. " +
                     "Equivalent to setting the PYTHONPYCACHEPREFIX environment variable for the standard launcher.", usageSyntax = "<path>", stability = OptionStability.STABLE) //
     public static final OptionKey<TruffleString> PyCachePrefix = new OptionKey<>(T_EMPTY_STRING, TS_OPTION_TYPE);
@@ -320,7 +320,7 @@ private PythonOptions() {
     public static final OptionKey<TruffleString> Executable = new OptionKey<>(T_EMPTY_STRING, TS_OPTION_TYPE);
 
     @Option(category = OptionCategory.EXPERT, usageSyntax = "<cmdPart>[" + J_STRING_LIST_SEPARATOR +
-                    "<cmdPart>]", help = "The executed command list as string joined by the executable list separator char. This must always correspond to the real, valid command list used to run GraalPython.") //
+                    "<cmdPart>]", help = "The executed command list as string joined by the executable list separator char. This must always correspond to the real, valid command list used to run GraalPy.") //
     public static final OptionKey<TruffleString> ExecutableList = new OptionKey<>(T_EMPTY_STRING, TS_OPTION_TYPE);
 
     @Option(category = OptionCategory.EXPERT, usageSyntax = "", help = "Option used by the venvlauncher to pass on the launcher target command", stability = OptionStability.STABLE) //
@@ -365,7 +365,7 @@ private PythonOptions() {
     @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Use the experimental panama backend for NFI.", stability = OptionStability.EXPERIMENTAL) //
     public static final OptionKey<Boolean> UsePanama = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Set by the launcher to true (false means that GraalPython is being embedded in an application).") //
+    @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Set by the launcher to true (false means that GraalPy is being embedded in an application).") //
     public static final OptionKey<Boolean> RunViaLauncher = new OptionKey<>(false);
 
     @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Enable built-in functions on the __graalpython__ module that are useful for debugging.") //

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/locale/PythonLocale.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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
@@ -40,8 +40,6 @@
  */
 package com.oracle.graal.python.runtime.locale;
 
-import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
-
 import java.util.Locale;
 import java.util.Locale.Category;
 
@@ -50,7 +48,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
-import com.oracle.truffle.api.strings.TruffleString;
 
 /**
  * Abstraction of the POSIX locale settings.
@@ -64,7 +61,7 @@
  *
  * <li>
  * <ul>
- * localeconv builtin, which is thin wrapped around libC's localeconv
+ * localeconv builtin, which is thin wrapper around libC's localeconv
  * </ul>
  * <ul>
  * from native code: directly locale sensitive libC functions
@@ -89,7 +86,6 @@
  * current locale, but get the locale from Python context.
  */
 public final class PythonLocale {
-    public static final TruffleString T_GETDEFAULTLOCALE = tsLiteral("__getdefaultlocale");
     private static final TruffleLogger LOGGER = PythonLanguage.getLogger(PythonLocale.class);
 
     public static final int LC_ALL = 6;
@@ -101,7 +97,7 @@ public final class PythonLocale {
     public static final int LC_TIME = 2;
 
     // We should have separate fields for each POSIX category and use them in the right places in
-    // GraalPython codebase. JVM does not recognize this many categories, but the interface of
+    // GraalPy codebase. JVM does not recognize this many categories, but the interface of
     // PythonLocale pretends that we do.
 
     private final Locale displayLocale;

mx.graalpython/mx_graalpython.py

@@ -1093,7 +1093,7 @@ def graalpytest(args):
     # if we got a binary path it's most likely CPython, so don't add graalpython args
     if not args.python:
         cmd_args += ["--experimental-options=true", "--python.EnableDebuggingBuiltins"]
-    elif args.python.endswith('graalpy') or args.python.endswith('graalpy-lt'):
+    elif 'graalpy' in os.path.basename(args.python):
         gp_args = ["--vm.ea", "--vm.esa", "--experimental-options=true", "--python.EnableDebuggingBuiltins"]
         mx.log(f"Executable seems to be GraalPy, prepending arguments: {gp_args}")
         cmd_args += gp_args