Make METH_STATIC work

msimacek · msimacek · commit 92430b324f8d · 2021-11-10T14:59:44.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java
@@ -2299,7 +2299,7 @@ int start(byte[] bs) {
 
     // static bytes.maketrans()
     // static bytearray.maketrans()
-    @Builtin(name = "maketrans", minNumOfPositionalArgs = 3, isClassmethod = true)
+    @Builtin(name = "maketrans", minNumOfPositionalArgs = 3, isStaticmethod = true)
     @GenerateNodeFactory
     public abstract static class MakeTransNode extends PythonBuiltinNode {
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java
@@ -3946,14 +3946,15 @@ private static boolean checkLayout(Object methodDef) {
 
         @TruffleBoundary
         private static PRootNode createWrapperRootNode(PythonLanguage language, int flags, String name) {
+            boolean isStatic = CExtContext.isMethStatic(flags);
             if (CExtContext.isMethNoArgs(flags)) {
-                return new MethNoargsRoot(language, name, PExternalFunctionWrapper.NOARGS);
+                return new MethNoargsRoot(language, name, isStatic, PExternalFunctionWrapper.NOARGS);
             } else if (CExtContext.isMethO(flags)) {
-                return new MethORoot(language, name, PExternalFunctionWrapper.O);
+                return new MethORoot(language, name, isStatic, PExternalFunctionWrapper.O);
             } else if (CExtContext.isMethKeywords(flags)) {
-                return new MethKeywordsRoot(language, name, PExternalFunctionWrapper.KEYWORDS);
+                return new MethKeywordsRoot(language, name, isStatic, PExternalFunctionWrapper.KEYWORDS);
             } else if (CExtContext.isMethVarargs(flags)) {
-                return new MethVarargsRoot(language, name, PExternalFunctionWrapper.VARARGS);
+                return new MethVarargsRoot(language, name, isStatic, PExternalFunctionWrapper.VARARGS);
             }
             throw new IllegalStateException("illegal method flags");
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java
@@ -150,6 +150,10 @@ public static boolean isMethFastcallWithKeywords(int flags) {
         return (flags & METH_FASTCALL) != 0 && (flags & METH_KEYWORDS) != 0;
     }
 
+    public static boolean isMethStatic(int flags) {
+        return (flags & METH_STATIC) != 0;
+    }
+
     public static boolean isClassOrStaticMethod(int flags) {
         return flags > 0 && (flags & (METH_CLASS | METH_STATIC)) != 0;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java
@@ -134,6 +134,10 @@ public int getFlags() {
         return flags;
     }
 
+    public boolean isStatic() {
+        return (flags & CExtContext.METH_STATIC) != 0;
+    }
+
     @TruffleBoundary
     public static int getFlags(Builtin builtin, RootCallTarget callTarget) {
         return getFlags(builtin, ((PRootNode) callTarget.getRootNode()).getSignature());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java
@@ -130,6 +130,9 @@ protected static Object doIt(PMethod self) {
 
         @Specialization
         protected static Object doIt(PBuiltinMethod self) {
+            if (self.getFunction().isStatic()) {
+                return PNone.NONE;
+            }
             return self.getSelf();
         }
     }
@@ -176,7 +179,10 @@ Object getModule(VirtualFrame frame, PBuiltinMethod self, @SuppressWarnings("unu
                         @Cached PyObjectLookupAttr lookup,
                         @CachedLibrary("self") DynamicObjectLibrary dylib) {
             Object module = dylib.getOrDefault(self, __MODULE__, PNone.NO_VALUE);
-            if (module == PNone.NO_VALUE) {
+            if (module != PNone.NO_VALUE) {
+                return module;
+            }
+            if (self.getSelf() instanceof PythonModule) {
                 /*
                  * 'getThreadStateNode' acts as a branch profile. This indirect call is done to
                  * easily support calls to this builtin with and without virtual frame, and because
@@ -189,9 +195,8 @@ Object getModule(VirtualFrame frame, PBuiltinMethod self, @SuppressWarnings("unu
                 } finally {
                     IndirectCallContext.exit(frame, language, getContext(), state);
                 }
-            } else {
-                return module;
             }
+            return PNone.NONE;
         }
 
         @Specialization(guards = "!isNoValue(value)", limit = "2")
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PDecoratedMethod.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/PDecoratedMethod.java
@@ -75,8 +75,14 @@ public void setCallable(Object callable) {
 
     @SuppressWarnings("unchecked")
     public Object boundToObject(PythonBuiltinClassType binding, PythonObjectFactory factory) {
-        if (GetClassNode.getUncached().execute(this) != PythonBuiltinClassType.PStaticmethod && callable instanceof BoundBuiltinCallable) {
-            return factory.createBuiltinClassmethodFromCallableObj(((BoundBuiltinCallable<Object>) callable).boundToObject(binding, factory));
+        if (GetClassNode.getUncached().execute(this) != PythonBuiltinClassType.PStaticmethod) {
+            if (callable instanceof BoundBuiltinCallable) {
+                return factory.createBuiltinClassmethodFromCallableObj(((BoundBuiltinCallable<Object>) callable).boundToObject(binding, factory));
+            }
+        } else {
+            if (callable instanceof PBuiltinMethod) {
+                return factory.createStaticmethodFromCallableObj(((PBuiltinMethod) callable).getFunction().boundToObject(binding, factory));
+            }
         }
         return this;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -1054,7 +1054,7 @@ static String doGeneric(Object self,
     }
 
     // str.maketrans()
-    @Builtin(name = "maketrans", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4, isClassmethod = true)
+    @Builtin(name = "maketrans", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4, isStaticmethod = true)
     @GenerateNodeFactory
     public abstract static class MakeTransNode extends PythonQuaternaryBuiltinNode {
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -112,11 +112,11 @@
 import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
 import com.oracle.graal.python.builtins.objects.iterator.PStringIterator;
 import com.oracle.graal.python.builtins.objects.iterator.PZip;
-import com.oracle.graal.python.builtins.objects.keywrapper.PKeyWrapper;
 import com.oracle.graal.python.builtins.objects.itertools.PChain;
 import com.oracle.graal.python.builtins.objects.itertools.PRepeat;
 import com.oracle.graal.python.builtins.objects.itertools.PTee;
 import com.oracle.graal.python.builtins.objects.itertools.PTeeDataObject;
+import com.oracle.graal.python.builtins.objects.keywrapper.PKeyWrapper;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.map.PMap;
 import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
@@ -632,7 +632,16 @@ public final PDecoratedMethod createStaticmethod(Object cls) {
     }
 
     public final PDecoratedMethod createStaticmethodFromCallableObj(Object callable) {
-        return trace(new PDecoratedMethod(PythonBuiltinClassType.PStaticmethod, PythonBuiltinClassType.PStaticmethod.getInstanceShape(getLanguage()), callable));
+        Object func = callable;
+        if (func instanceof PBuiltinFunction) {
+            /*
+             * CPython's C static methods contain an object of type `builtin_function_or_method`
+             * (our PBuiltinMethod). Their self points to their type, but when called they get NULL
+             * as the first argument instead.
+             */
+            func = createBuiltinMethod(((PBuiltinFunction) func).getEnclosingType(), (PBuiltinFunction) func);
+        }
+        return trace(new PDecoratedMethod(PythonBuiltinClassType.PStaticmethod, PythonBuiltinClassType.PStaticmethod.getInstanceShape(getLanguage()), func));
     }
 
     /*

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,10 @@ public static boolean isMethFastcallWithKeywords(int flags) {`
`150`	`150`	`return (flags & METH_FASTCALL) != 0 && (flags & METH_KEYWORDS) != 0;`
`151`	`151`	`}`
`152`	`152`
	`153`	`+ public static boolean isMethStatic(int flags) {`
	`154`	`+ return (flags & METH_STATIC) != 0;`
	`155`	`+ }`
	`156`	`+`
`153`	`157`	`public static boolean isClassOrStaticMethod(int flags) {`
`154`	`158`	`return flags > 0 && (flags & (METH_CLASS \| METH_STATIC)) != 0;`
`155`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ protected static Object doIt(PMethod self) {`
`130`	`130`
`131`	`131`	`@Specialization`
`132`	`132`	`protected static Object doIt(PBuiltinMethod self) {`
	`133`	`+ if (self.getFunction().isStatic()) {`
	`134`	`+ return PNone.NONE;`
	`135`	`+ }`
`133`	`136`	`return self.getSelf();`
`134`	`137`	`}`
`135`	`138`	`}`
`@@ -176,7 +179,10 @@ Object getModule(VirtualFrame frame, PBuiltinMethod self, @SuppressWarnings("unu`
`176`	`179`	`@Cached PyObjectLookupAttr lookup,`
`177`	`180`	`@CachedLibrary("self") DynamicObjectLibrary dylib) {`
`178`	`181`	`Object module = dylib.getOrDefault(self, __MODULE__, PNone.NO_VALUE);`
`179`		`- if (module == PNone.NO_VALUE) {`
	`182`	`+ if (module != PNone.NO_VALUE) {`
	`183`	`+ return module;`
	`184`	`+ }`
	`185`	`+ if (self.getSelf() instanceof PythonModule) {`
`180`	`186`	`/*`
`181`	`187`	`* 'getThreadStateNode' acts as a branch profile. This indirect call is done to`
`182`	`188`	`* easily support calls to this builtin with and without virtual frame, and because`
`@@ -189,9 +195,8 @@ Object getModule(VirtualFrame frame, PBuiltinMethod self, @SuppressWarnings("unu`
`189`	`195`	`} finally {`
`190`	`196`	`IndirectCallContext.exit(frame, language, getContext(), state);`
`191`	`197`	`}`
`192`		`- } else {`
`193`		`- return module;`
`194`	`198`	`}`
	`199`	`+ return PNone.NONE;`
`195`	`200`	`}`
`196`	`201`
`197`	`202`	`@Specialization(guards = "!isNoValue(value)", limit = "2")`
Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ static String doGeneric(Object self,`
`1054`	`1054`	`}`
`1055`	`1055`
`1056`	`1056`	`// str.maketrans()`
`1057`		`- @Builtin(name = "maketrans", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4, isClassmethod = true)`
	`1057`	`+ @Builtin(name = "maketrans", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4, isStaticmethod = true)`
`1058`	`1058`	`@GenerateNodeFactory`
`1059`	`1059`	`public abstract static class MakeTransNode extends PythonQuaternaryBuiltinNode {`
`1060`	`1060`