[GR-60816] Add sys.exception()

PullRequest: graalpython/3629

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

@@ -1,6 +1,9 @@
 test.test_sys.ActiveExceptionTests.test_exc_info_no_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_instance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys.ActiveExceptionTests.test_sys_exception_no_exception @ linux-x86_64
+test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_instance @ linux-x86_64
+test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_type @ linux-x86_64
 test.test_sys.DisplayHookTest.test_custom_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.DisplayHookTest.test_lost_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.DisplayHookTest.test_original_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, 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
@@ -863,6 +863,25 @@ static PTuple run(VirtualFrame frame,
         }
     }
 
+    @Builtin(name = "exception", needsFrame = true)
+    @GenerateNodeFactory
+    abstract static class ExceptionNode extends PythonBuiltinNode {
+
+        @Specialization
+        static Object run(VirtualFrame frame,
+                        @Bind("this") Node inliningTarget,
+                        @Cached GetEscapedExceptionNode getEscapedExceptionNode,
+                        @Cached GetCaughtExceptionNode getCaughtExceptionNode) {
+            AbstractTruffleException currentException = getCaughtExceptionNode.execute(frame);
+            assert currentException != PException.NO_EXCEPTION;
+            if (currentException == null) {
+                return PNone.NONE;
+            } else {
+                return getEscapedExceptionNode.execute(inliningTarget, currentException);
+            }
+        }
+    }
+
     // ATTENTION: this is intentionally a PythonBuiltinNode and not PythonUnaryBuiltinNode,
     // because we need a guarantee that this builtin will get its own stack frame in order to
     // be able to count how many frames down the call stack we need to walk

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/posix/DirEntryBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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
@@ -81,7 +81,6 @@
 import com.oracle.graal.python.runtime.PosixSupportLibrary;
 import com.oracle.graal.python.runtime.PosixSupportLibrary.PosixException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -315,7 +314,6 @@ abstract static class TestModeNode extends Node {
 
         private final long expectedMode;
         private final int expectedDirEntryType;
-        private StatHelperNode statHelperNode;
 
         protected TestModeNode(long expectedMode, int expectedDirEntryType) {
             this.expectedMode = expectedMode;
@@ -327,8 +325,9 @@ protected TestModeNode(long expectedMode, int expectedDirEntryType) {
         @Specialization(guards = "followSymlinks")
         boolean testModeUsingStat(VirtualFrame frame, PDirEntry self, boolean followSymlinks,
                         @Bind("this") Node inliningTarget,
+                        @Shared @Cached StatHelperNode statHelperNode,
                         @Shared @Cached SequenceStorageNodes.GetItemScalarNode getItemScalarNode) {
-            PTuple statResult = getStatHelperNode().execute(frame, self, followSymlinks, true);
+            PTuple statResult = statHelperNode.execute(frame, self, followSymlinks, true);
             if (statResult == null) {
                 // file not found
                 return false;
@@ -341,21 +340,14 @@ boolean testModeUsingStat(VirtualFrame frame, PDirEntry self, boolean followSyml
         @Specialization(guards = "!followSymlinks")
         boolean useTypeIfKnown(VirtualFrame frame, PDirEntry self, @SuppressWarnings("unused") boolean followSymlinks,
                         @Bind("this") Node inliningTarget,
+                        @Shared @Cached StatHelperNode statHelperNode,
                         @Shared @Cached SequenceStorageNodes.GetItemScalarNode getItemScalarNode,
                         @CachedLibrary(limit = "1") PosixSupportLibrary posixLib) {
             int entryType = posixLib.dirEntryGetType(PosixSupport.get(this), self.dirEntryData);
             if (entryType != DT_UNKNOWN.value) {
                 return entryType == expectedDirEntryType;
             }
-            return testModeUsingStat(frame, self, false, inliningTarget, getItemScalarNode);
-        }
-
-        private StatHelperNode getStatHelperNode() {
-            if (statHelperNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                statHelperNode = insert(DirEntryBuiltinsFactory.StatHelperNodeGen.create());
-            }
-            return statHelperNode;
+            return testModeUsingStat(frame, self, false, inliningTarget, statHelperNode, getItemScalarNode);
         }
 
         @NeverDefault