make methods static where possible

lukasstadler · lukasstadler · commit 54facbbdf836 · 2023-03-20T13:57:32.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBytesBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBytesBuiltins.java
@@ -149,7 +149,7 @@ int fallback(Object obj) {
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject}, call = Ignored)
     abstract static class PyTruffleBytes_Concat extends CApiBinaryBuiltinNode {
         @Specialization
-        Object concat(PBytes original, Object newPart,
+        static Object concat(PBytes original, Object newPart,
                         @Cached BytesBuiltins.AddNode addNode) {
             return addNode.execute(null, original, newPart);
         }
@@ -163,7 +163,7 @@ Object fallback(Object original, @SuppressWarnings("unused") Object newPart) {
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject}, call = Direct)
     abstract static class _PyBytes_Join extends CApiBinaryBuiltinNode {
         @Specialization
-        Object join(PBytes original, Object newPart,
+        static Object join(PBytes original, Object newPart,
                         @Cached BytesBuiltins.JoinNode joinNode) {
             return joinNode.execute(null, original, newPart);
         }
@@ -177,7 +177,7 @@ Object fallback(Object original, @SuppressWarnings("unused") Object newPart) {
     @CApiBuiltin(ret = PyObjectTransfer, args = {ConstCharPtrAsTruffleString, PyObject}, call = Ignored)
     abstract static class PyTruffleBytes_FromFormat extends CApiBinaryBuiltinNode {
         @Specialization
-        Object fromFormat(TruffleString fmt, Object args,
+        static Object fromFormat(TruffleString fmt, Object args,
                         @Cached ModNode modeNode,
                         @Cached EncodeNode encodeNode) {
             Object formated = modeNode.execute(null, fmt, args);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCEvalBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCEvalBuiltins.java
@@ -93,7 +93,7 @@ abstract static class PyEval_SaveThread extends CApiNullaryBuiltinNode {
         private static final TruffleLogger LOGGER = CApiContext.getLogger(PyEval_SaveThread.class);
 
         @Specialization
-        Object save(@Cached GilNode gil) {
+        static Object save(@Cached GilNode gil) {
             PythonContext context = PythonContext.get(gil);
             PThreadState threadState = PThreadState.getThreadState(PythonLanguage.get(gil), context);
             LOGGER.fine("C extension releases GIL");
@@ -107,7 +107,7 @@ abstract static class PyEval_RestoreThread extends CApiUnaryBuiltinNode {
         private static final TruffleLogger LOGGER = CApiContext.getLogger(PyEval_RestoreThread.class);
 
         @Specialization
-        Object restore(@SuppressWarnings("unused") Object ptr,
+        static Object restore(@SuppressWarnings("unused") Object ptr,
                         @Cached GilNode gil) {
             PythonContext context = PythonContext.get(gil);
             PThreadState threadState = PThreadState.getThreadState(PythonLanguage.get(gil), context);
@@ -130,7 +130,7 @@ Object release(
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject, PyObject, Pointer, Pointer, Pointer, PyObject, PyObject}, call = Ignored)
     abstract static class _PyTruffleEval_EvalCodeEx extends CApi8BuiltinNode {
         @Specialization
-        Object doGeneric(PCode code, Object globals, Object locals,
+        static Object doGeneric(PCode code, Object globals, Object locals,
                         Object argumentArrayPtr, Object kwsPtr, Object defaultValueArrayPtr,
                         Object kwdefaultsWrapper, Object closureObj,
                         @CachedLibrary(limit = "2") InteropLibrary ptrLib,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCodeBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCodeBuiltins.java
@@ -68,7 +68,7 @@ public final class PythonCextCodeBuiltins {
     abstract static class PyCode_New extends CApi15BuiltinNode {
         @Specialization
         @TruffleBoundary
-        public Object codeNew(int argcount, int kwonlyargcount, int nlocals, int stacksize, int flags, Object code, Object consts,
+        public static Object codeNew(int argcount, int kwonlyargcount, int nlocals, int stacksize, int flags, Object code, Object consts,
                         Object names, Object varnames, Object freevars, Object cellvars, Object filename, Object name, int firstlineno, Object lnotab,
                         @Cached CallNode callNode) {
             /*
@@ -89,7 +89,7 @@ public Object codeNew(int argcount, int kwonlyargcount, int nlocals, int stacksi
     abstract static class PyCode_NewWithPosOnlyArgs extends CApi16BuiltinNode {
         @Specialization
         @TruffleBoundary
-        public Object codeNew(int argcount, int posonlyargcount, int kwonlyargcount, int nlocals, int stacksize, int flags, Object code, Object consts,
+        public static Object codeNew(int argcount, int posonlyargcount, int kwonlyargcount, int nlocals, int stacksize, int flags, Object code, Object consts,
                         Object names, Object varnames, Object freevars, Object cellvars, Object filename, Object name, int firstlineno, Object lnotab,
                         @Cached CallNode callNode) {
             /*
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextDictBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextDictBuiltins.java
@@ -189,7 +189,7 @@ protected boolean isDictSubtype(Node inliningTarget, Object obj, InlinedGetClass
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject, PyObject}, call = Direct)
     abstract static class _PyDict_Pop extends CApiTernaryBuiltinNode {
         @Specialization
-        Object pop(PDict dict, Object key, Object defaultValue,
+        static Object pop(PDict dict, Object key, Object defaultValue,
                         @Cached PopNode popNode) {
             return popNode.execute(null, dict, key, defaultValue);
         }
@@ -335,7 +335,7 @@ public int fallback(Object dict, Object key, Object value, Object givenHash) {
     @CApiBuiltin(ret = PyObjectBorrowed, args = {PyObject, PyObject, PyObject}, call = Direct)
     abstract static class PyDict_SetDefault extends CApiTernaryBuiltinNode {
         @Specialization
-        Object setItem(PDict dict, Object key, Object value,
+        static Object setItem(PDict dict, Object key, Object value,
                         @Cached DictBuiltins.SetDefaultNode setItemNode) {
             return setItemNode.execute(null, dict, key, value);
         }
@@ -393,7 +393,7 @@ public int fallback(Object dict, @SuppressWarnings("unused") Object key) {
     @CApiBuiltin(ret = Void, args = {PyObject}, call = Direct)
     abstract static class PyDict_Clear extends CApiUnaryBuiltinNode {
         @Specialization
-        Object keys(PDict dict,
+        static Object keys(PDict dict,
                         @Cached ClearNode clearNode) {
             return clearNode.execute(null, dict);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextHashBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextHashBuiltins.java
@@ -91,7 +91,7 @@ abstract static class PyTruffle_HashConstant extends CApiUnaryBuiltinNode {
 
         @Specialization
         @TruffleBoundary
-        long doI(int idx) {
+        static long doI(int idx) {
             switch (idx) {
                 case 0:
                     return PyObjectHashNode.getUncached().execute(null, Double.POSITIVE_INFINITY);
@@ -127,7 +127,7 @@ abstract static class _PyTruffle_HashBytes extends CApiUnaryBuiltinNode {
 
         @Specialization
         @TruffleBoundary
-        long doI(Object value,
+        static long doI(Object value,
                         @Cached PyObjectHashNode hashNode) {
             return hashNode.execute(null, value);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextImportBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextImportBuiltins.java
@@ -73,7 +73,7 @@ public final class PythonCextImportBuiltins {
     @CApiBuiltin(name = "PyImport_ImportModuleNoBlock", ret = PyObjectTransfer, args = {ConstCharPtrAsTruffleString}, call = Direct)
     abstract static class PyImport_ImportModule extends CApiUnaryBuiltinNode {
         @Specialization
-        Object imp(TruffleString name) {
+        static Object imp(TruffleString name) {
             return AbstractImportNode.importModule(name, T_IMPORT_ALL);
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextIterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextIterBuiltins.java
@@ -65,7 +65,7 @@ PSequenceIterator call(Object seq) {
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject}, call = Direct)
     abstract static class PyCallIter_New extends CApiBinaryBuiltinNode {
         @Specialization
-        Object getItem(Object it, Object sentinel,
+        static Object getItem(Object it, Object sentinel,
                         @Cached IterNode iterNode) {
             return iterNode.execute(null, it, sentinel);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextLongBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextLongBuiltins.java
@@ -185,7 +185,7 @@ protected boolean isPIntSubtype(Object obj, GetClassNode getClassNode, IsSubtype
     abstract static class PyLong_FromDouble extends CApiUnaryBuiltinNode {
 
         @Specialization
-        Object fromDouble(double d,
+        static Object fromDouble(double d,
                         @Cached IntNode intNode) {
             return intNode.execute(null, d);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextMemoryViewBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextMemoryViewBuiltins.java
@@ -119,7 +119,7 @@ Object get(Object obj, int buffertype, byte orderByte,
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
     abstract static class PyMemoryView_FromObject extends CApiUnaryBuiltinNode {
         @Specialization
-        Object wrap(Object object,
+        static Object wrap(Object object,
                         @Cached PyMemoryViewFromObject memoryViewNode) {
             return memoryViewNode.execute(null, object);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextModuleBuiltins.java
@@ -152,7 +152,7 @@ Object run(TruffleString name,
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
     abstract static class PyModule_GetNameObject extends CApiUnaryBuiltinNode {
         @Specialization
-        Object getName(Object o,
+        static Object getName(Object o,
                         @Cached PyObjectLookupAttr lookupAttrNode) {
             return lookupAttrNode.execute(null, o, T___NAME__);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java
@@ -120,6 +120,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -396,7 +397,7 @@ static Object asFileDescriptor(Object obj,
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject}, call = Ignored)
     abstract static class PyTruffleObject_GenericGetAttr extends CApiBinaryBuiltinNode {
         @Specialization
-        Object getAttr(Object obj, Object attr,
+        static Object getAttr(Object obj, Object attr,
                         @Cached GetAttributeNode getAttrNode) {
             return getAttrNode.execute(null, obj, attr);
         }
@@ -523,7 +524,7 @@ static PNone doNativeNone() {
     abstract static class _PyObject_Dump extends CApiUnaryBuiltinNode {
 
         @Specialization
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         int doGeneric(Object ptrObject) {
             PythonContext context = getContext();
             PrintWriter stderr = new PrintWriter(context.getStandardErr());
@@ -608,7 +609,7 @@ static TruffleString asciiNone(@SuppressWarnings("unused") PNone obj) {
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
     abstract static class PyObject_Type extends CApiUnaryBuiltinNode {
         @Specialization
-        Object type(Object obj,
+        static Object type(Object obj,
                         @Cached GetClassNode getClass) {
             return getClass.execute(obj);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextPyStateBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextPyStateBuiltins.java
@@ -70,7 +70,7 @@ public final class PythonCextPyStateBuiltins {
     abstract static class PyGILState_Ensure extends CApiNullaryBuiltinNode {
 
         @Specialization
-        Object save(@Cached GilNode gil) {
+        static Object save(@Cached GilNode gil) {
             // TODO allow acquiring from foreign thread
             boolean acquired = gil.acquire();
             return acquired ? 1 : 0;
@@ -90,7 +90,7 @@ Object check() {
     abstract static class PyGILState_Release extends CApiUnaryBuiltinNode {
 
         @Specialization
-        Object restore(int state,
+        static Object restore(int state,
                         @Cached GilNode gil) {
             gil.release(state == 1);
             return 0;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextSetBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextSetBuiltins.java
@@ -94,9 +94,8 @@ Object newSet(Object iterable,
             return constructSetNode.executeWith(null, iterable);
         }
 
-        @SuppressWarnings("unused")
         @Specialization
-        Object newSet(PNone iterable) {
+        Object newSet(@SuppressWarnings("unused") PNone iterable) {
             return factory().createSet();
         }
     }
@@ -198,7 +197,7 @@ private Object next(int pos, HashingStorage storage, HashingStorageGetIterator g
     @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
     abstract static class PySet_Pop extends CApiUnaryBuiltinNode {
         @Specialization
-        Object pop(PSet set,
+        static Object pop(PSet set,
                         @Cached com.oracle.graal.python.builtins.objects.set.SetBuiltins.PopNode popNode) {
             return popNode.execute(null, set);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextSlotBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextSlotBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTupleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTupleBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextWeakrefBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextWeakrefBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public final class PythonCextImportBuiltins {`
`73`	`73`	`@CApiBuiltin(name = "PyImport_ImportModuleNoBlock", ret = PyObjectTransfer, args = {ConstCharPtrAsTruffleString}, call = Direct)`
`74`	`74`	`abstract static class PyImport_ImportModule extends CApiUnaryBuiltinNode {`
`75`	`75`	`@Specialization`
`76`		`- Object imp(TruffleString name) {`
	`76`	`+ static Object imp(TruffleString name) {`
`77`	`77`	`return AbstractImportNode.importModule(name, T_IMPORT_ALL);`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ PSequenceIterator call(Object seq) {`
`65`	`65`	`@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject, PyObject}, call = Direct)`
`66`	`66`	`abstract static class PyCallIter_New extends CApiBinaryBuiltinNode {`
`67`	`67`	`@Specialization`
`68`		`- Object getItem(Object it, Object sentinel,`
	`68`	`+ static Object getItem(Object it, Object sentinel,`
`69`	`69`	`@Cached IterNode iterNode) {`
`70`	`70`	`return iterNode.execute(null, it, sentinel);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ protected boolean isPIntSubtype(Object obj, GetClassNode getClassNode, IsSubtype`
`185`	`185`	`abstract static class PyLong_FromDouble extends CApiUnaryBuiltinNode {`
`186`	`186`
`187`	`187`	`@Specialization`
`188`		`- Object fromDouble(double d,`
	`188`	`+ static Object fromDouble(double d,`
`189`	`189`	`@Cached IntNode intNode) {`
`190`	`190`	`return intNode.execute(null, d);`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ Object get(Object obj, int buffertype, byte orderByte,`
`119`	`119`	`@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)`
`120`	`120`	`abstract static class PyMemoryView_FromObject extends CApiUnaryBuiltinNode {`
`121`	`121`	`@Specialization`
`122`		`- Object wrap(Object object,`
	`122`	`+ static Object wrap(Object object,`
`123`	`123`	`@Cached PyMemoryViewFromObject memoryViewNode) {`
`124`	`124`	`return memoryViewNode.execute(null, object);`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ Object run(TruffleString name,`
`152`	`152`	`@CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)`
`153`	`153`	`abstract static class PyModule_GetNameObject extends CApiUnaryBuiltinNode {`
`154`	`154`	`@Specialization`
`155`		`- Object getName(Object o,`
	`155`	`+ static Object getName(Object o,`
`156`	`156`	`@Cached PyObjectLookupAttr lookupAttrNode) {`
`157`	`157`	`return lookupAttrNode.execute(null, o, T___NAME__);`
`158`	`158`	`}`