CallNode: getUncached().execute -> CallNode.executeUncached, execute without a frame arg -> 'executeWithoutFrame'

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AsyncioModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -249,7 +249,7 @@ public void postInitialize(Python3Core core) {
         self.setAttribute(CURRENT_TASKS_ATTR, factory.createDict());
         Object weakref = AbstractImportNode.importModule(WEAKREF);
         Object weakSetCls = PyObjectGetAttr.executeUncached(weakref, WEAKSET);
-        Object weakSet = CallNode.getUncached().execute(weakSetCls);
+        Object weakSet = CallNode.executeUncached(weakSetCls);
         self.setAttribute(ALL_TASKS_ATTR, weakSet);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -2487,7 +2487,7 @@ private static Object buildJavaClass(Object namespace, TruffleString name, Objec
             // uncached PythonContext get, since this code path is slow in any case
             Object module = PythonContext.get(null).lookupBuiltinModule(T___GRAALPYTHON__);
             Object buildFunction = PyObjectLookupAttr.executeUncached(module, T_BUILD_JAVA_CLASS);
-            return CallNode.getUncached().execute(buildFunction, namespace, name, base);
+            return CallNode.executeUncached(buildFunction, namespace, name, base);
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java

@@ -248,7 +248,7 @@ static void handle(Node inliningTarget, TruffleEncoder encoder, TruffleString er
             if (!fixed) {
                 int start = encoder.getInputPosition();
                 int end = start + encoder.getErrorLength();
-                Object exception = lazyCallNode.execute(UnicodeEncodeError, encoder.getEncodingName(), inputObject, start, end, encoder.getErrorReason());
+                Object exception = lazyCallNode.executeWithoutFrame(UnicodeEncodeError, encoder.getEncodingName(), inputObject, start, end, encoder.getErrorReason());
                 if (exception instanceof PBaseException) {
                     throw raiseNode.get(inliningTarget).raiseExceptionObject((PBaseException) exception);
                 } else {
@@ -370,7 +370,7 @@ static Object doRaise(Node inliningTarget, TruffleDecoder decoder, Object inputO
                         @Cached PRaiseNode.Lazy raiseNode) {
             int start = decoder.getInputPosition();
             int end = start + decoder.getErrorLength();
-            Object exception = callNode.execute(UnicodeDecodeError, decoder.getEncodingName(), inputObject, start, end, decoder.getErrorReason());
+            Object exception = callNode.executeWithoutFrame(UnicodeDecodeError, decoder.getEncodingName(), inputObject, start, end, decoder.getErrorReason());
             if (justMakeExcept) {
                 return exception;
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/FaulthandlerModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, 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
@@ -95,7 +95,7 @@ private static void dumpTraceback(Object callable, Object file) {
                 f = PNone.NONE;
             }
             try {
-                CallNode.getUncached().execute(null, callable, PNone.NONE, PNone.NONE, f);
+                CallNode.executeUncached(callable, PNone.NONE, PNone.NONE, f);
             } catch (RuntimeException e) {
                 ExceptionUtils.printPythonLikeStackTrace(e);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -370,7 +370,7 @@ private static boolean getImporter(PythonModule sysModule, TruffleString inputFi
                     int numHooks = storage.length();
                     for (int i = 0; i < numHooks; i++) {
                         try {
-                            importer = CallNode.getUncached().execute(hooks[i], inputFilePath);
+                            importer = CallNode.executeUncached(hooks[i], inputFilePath);
                             break;
                         } catch (PException e) {
                             if (!IsSubtypeNode.getUncached().execute(GetClassNode.executeUncached(e.getUnreifiedException()), ImportError)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java

@@ -420,7 +420,7 @@ private RuntimeException handleCompilationError(RuntimeException e, InteropLibra
                             int position = sourceSection.getCharIndex();
                             PythonModule module = context.lookupBuiltinModule(BuiltinNames.T__SRE);
                             Object errorConstructor = PyObjectLookupAttr.executeUncached(module, T_ERROR);
-                            PBaseException exception = (PBaseException) CallNode.getUncached().execute(errorConstructor, reason, originalPattern, position);
+                            PBaseException exception = (PBaseException) CallNode.executeUncached(errorConstructor, reason, originalPattern, position);
                             return PRaiseNode.getUncached().raiseExceptionObject(exception);
                         }
                     }
@@ -673,8 +673,8 @@ protected Object doCached(VirtualFrame frame, PythonObject pattern, Object input
             reCheckInputTypeNode.execute(frame, input, tRegexCache.isBinary());
 
             if (fallbackProfile.profile(inliningTarget, libCompiledRegex.isNull(compiledRegex))) {
-                Object fallbackRegex = getCallFallbackCompileNode().execute(getGetFallbackCompileNode().executeObject(frame, pattern));
-                return getCallFallbackMethodNode().execute(getFallbackMethodNode.executeObject(frame, fallbackRegex), input, pos, endPos);
+                Object fallbackRegex = getCallFallbackCompileNode().executeWithoutFrame(getGetFallbackCompileNode().executeObject(frame, pattern));
+                return getCallFallbackMethodNode().executeWithoutFrame(getFallbackMethodNode.executeObject(frame, fallbackRegex), input, pos, endPos);
             }
 
             Object truncatedInput = input;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java

@@ -752,8 +752,8 @@ private static void callShowWarning(PythonContext context, Object category, Obje
 
             assert message != null && category != null && filename != null && source != null;
             assert message != PNone.NO_VALUE && category != PNone.NO_VALUE && source != PNone.NO_VALUE;
-            Object msg = CallNode.getUncached().execute(warnmsgCls, message, category, filename, lineno, PNone.NONE, PNone.NONE, source);
-            CallNode.getUncached().execute(showFn, msg);
+            Object msg = CallNode.executeUncached(warnmsgCls, message, category, filename, lineno, PNone.NONE, PNone.NONE, source);
+            CallNode.executeUncached(showFn, msg);
         }
 
         /**
@@ -1182,7 +1182,7 @@ private void executeImpl(Object source, Object category, TruffleString format, i
                 } catch (IllegalFormatException e) {
                     throw CompilerDirectives.shouldNotReachHere("error while formatting \"" + format + "\"", e);
                 }
-                CallNode.getUncached().execute(warn, message, category, stackLevel, source);
+                CallNode.executeUncached(warn, message, category, stackLevel, source);
             }
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/Obj2SstBase.java

@@ -181,7 +181,7 @@ <T> T[] lookupAndConvertSequence(Object obj, TruffleString attrName, TruffleStri
 
     static boolean isInstanceOf(Object o, PythonAbstractClass cls) {
         Object check = lookupAttr(cls, SpecialMethodNames.T___INSTANCECHECK__);
-        Object result = CallNode.getUncached().execute(check, o);
+        Object result = CallNode.executeUncached(check, o);
         return CastToJavaBooleanNode.executeUncached(result);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextAbstractBuiltins.java

@@ -522,7 +522,7 @@ static Object getSlice(Object obj, long iLow, long iHigh,
                         @Cached PySliceNew sliceNode,
                         @Cached CallNode callNode) {
             Object getItemCallable = lookupAttrNode.execute(null, inliningTarget, obj, T___GETITEM__);
-            return callNode.execute(getItemCallable, sliceNode.execute(inliningTarget, iLow, iHigh, PNone.NONE));
+            return callNode.executeWithoutFrame(getItemCallable, sliceNode.execute(inliningTarget, iLow, iHigh, PNone.NONE));
         }
 
         @Specialization(guards = "!checkNode.execute(inliningTarget, obj)", limit = "1")
@@ -580,7 +580,7 @@ static Object repeat(Object obj, long n,
                         @SuppressWarnings("unused") @Exclusive @Cached PySequenceCheckNode checkNode) {
             Object imulCallable = lookupNode.execute(null, inliningTarget, obj, T___IMUL__);
             if (imulCallable != PNone.NO_VALUE) {
-                Object ret = callNode.execute(imulCallable, n);
+                Object ret = callNode.executeWithoutFrame(imulCallable, n);
                 return ret;
             }
             return mulNode.executeObject(null, obj, n);
@@ -635,7 +635,7 @@ static Object concat(Object s1, Object s2,
                         @SuppressWarnings("unused") @Exclusive @Cached PySequenceCheckNode checkNode) {
             Object iaddCallable = lookupNode.execute(null, inliningTarget, s1, T___IADD__);
             if (iaddCallable != PNone.NO_VALUE) {
-                return callNode.execute(iaddCallable, s2);
+                return callNode.executeWithoutFrame(iaddCallable, s2);
             }
             return addNode.executeObject(null, s1, s2);
         }
@@ -824,7 +824,7 @@ static Object items(Object obj,
                         @Cached CallNode callNode,
                         @Shared @Cached ConstructListNode listNode) {
             Object attr = getAttrNode.execute(inliningTarget, obj, T_ITEMS);
-            return listNode.execute(null, callNode.execute(attr));
+            return listNode.execute(null, callNode.executeWithoutFrame(attr));
         }
     }
 
@@ -846,7 +846,7 @@ static Object values(Object obj,
                         @Cached PRaiseNode.Lazy raiseNode) {
             checkNonNullArg(inliningTarget, obj, raiseNode);
             Object attr = getAttrNode.execute(inliningTarget, obj, T_VALUES);
-            return listNode.execute(null, callNode.execute(attr));
+            return listNode.execute(null, callNode.executeWithoutFrame(attr));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCodeBuiltins.java

@@ -90,7 +90,7 @@ public static Object codeNew(int argcount, int posonlyargcount, int kwonlyargcou
                             firstlineno, lnotab, exceptionTable,
                             freevars, cellvars
             };
-            return callNode.execute(PythonBuiltinClassType.PCode, args);
+            return callNode.executeWithoutFrame(PythonBuiltinClassType.PCode, args);
         }
     }