Implement PyThreadState_GetFrame

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_pystate.py

@@ -36,14 +36,14 @@
 # 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.
+import sys
 
-from . import CPyExtTestCase, CPyExtFunction
+from . import CPyExtTestCase, CPyExtFunction, CPyExtType
 
 __dir__ = __file__.rpartition("/")[0]
 
 
 class TestPystate(CPyExtTestCase):
-
     test_PyThreadState_GetDict = CPyExtFunction(
         lambda args: type({}),
         lambda: (
@@ -58,3 +58,15 @@ class TestPystate(CPyExtTestCase):
         arguments=["PyObject* ignored"],
         callfunction="wrap_PyThreadState_GetDict",
     )
+
+    def test_PyThreadState_GetFrame(self):
+        Tester = CPyExtType(
+            "PyThreadState_GetFrameTester",
+            code="""
+            static PyObject* get_frame(PyObject* unused) {
+                return (PyObject*)PyThreadState_GetFrame(PyThreadState_GET());
+            }
+            """,
+            tp_methods='{"get_frame", (PyCFunction)get_frame, METH_NOARGS | METH_STATIC, NULL}',
+        )
+        assert Tester.get_frame() is sys._getframe(0)

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

@@ -44,6 +44,7 @@
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Pointer;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyFrameObjectTransfer;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyThreadState;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
@@ -55,18 +56,23 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.nodes.frame.GetCurrentFrameRef;
+import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
 
 public final class PythonCextPyStateBuiltins {
 
@@ -131,6 +137,18 @@ PDict get(@Cached PythonObjectFactory factory) {
         }
     }
 
+    @CApiBuiltin(ret = PyFrameObjectTransfer, args = {PyThreadState}, call = Direct)
+    abstract static class PyThreadState_GetFrame extends CApiUnaryBuiltinNode {
+        @Specialization
+        PFrame get(
+                        @Bind("this") Node inliningTarget,
+                        @Cached GetCurrentFrameRef getCurrentFrameRef,
+                        @Cached ReadCallerFrameNode readCallerFrameNode) {
+            PFrame.Reference frameRef = getCurrentFrameRef.execute(null, inliningTarget);
+            return readCallerFrameNode.executeWith(frameRef, 0);
+        }
+    }
+
     @CApiBuiltin(ret = PyObjectBorrowed, args = {Py_ssize_t}, call = Ignored)
     abstract static class PyTruffleState_FindModule extends CApiUnaryBuiltinNode {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -865,7 +865,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PySys_WriteStdout", ret = Void, args = {ConstCharPtrAsTruffleString, VARARGS}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_Delete", ret = Void, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_EnterTracing", ret = Void, args = {PyThreadState}, call = NotImplemented)
-    @CApiBuiltin(name = "PyThreadState_GetFrame", ret = PyFrameObjectTransfer, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_GetID", ret = UINT64_T, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_GetInterpreter", ret = PyInterpreterState, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_LeaveTracing", ret = Void, args = {PyThreadState}, call = NotImplemented)