[GR-40129] Avoid pytest false negatives on interop exceptions

PullRequest: graalpython/2374

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -2867,11 +2867,10 @@ private PException popExceptionState(Object[] arguments, Object savedException,
         PException localException = null;
         if (savedException instanceof PException) {
             localException = (PException) savedException;
+            PArguments.setException(arguments, localException);
+        } else if (savedException == null) {
+            PArguments.setException(arguments, outerException);
         }
-        if (savedException == null) {
-            savedException = outerException;
-        }
-        PArguments.setException(arguments, (PException) savedException);
         return localException;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java

@@ -59,7 +59,6 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.graal.python.runtime.exception.PException;
-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.Fallback;
@@ -68,9 +67,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
-import com.oracle.truffle.api.interop.ExceptionType;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
@@ -197,9 +193,8 @@ static Object getNativeVoidPtr(@SuppressWarnings("unused") PythonNativeVoidPtr o
         return PythonBuiltinClassType.PInt;
     }
 
-    @Specialization(guards = "isForeignRuntimeException(object, lib)")
-    static Object getTruffleException(@SuppressWarnings("unused") AbstractTruffleException object,
-                    @SuppressWarnings("unused") @CachedLibrary(limit = "3") InteropLibrary lib) {
+    @Specialization
+    static Object getTruffleException(@SuppressWarnings("unused") AbstractTruffleException object) {
         /*
          * Special case: if Python code asks for the class of a foreign exception, we return a
          * Python type that inherits from BaseException. We do this because Python users usually
@@ -217,12 +212,4 @@ static Object getForeign(@SuppressWarnings("unused") Object object) {
     protected static boolean hasInitialClass(Shape shape) {
         return (shape.getFlags() & PythonObject.CLASS_CHANGED_FLAG) == 0;
     }
-
-    protected static boolean isForeignRuntimeException(AbstractTruffleException e, InteropLibrary lib) {
-        try {
-            return lib.isException(e) && lib.getExceptionType(e) == ExceptionType.RUNTIME_ERROR;
-        } catch (UnsupportedMessageException ex) {
-            throw CompilerDirectives.shouldNotReachHere(ex);
-        }
-    }
 }

graalpython/lib-graalpython/modules/hpy/test/test_hpycontextvar.py

@@ -21,10 +21,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import pytest
 from .support import HPyTest
 
 
 class TestContextVar(HPyTest):
+    @pytest.mark.skip(reason="GR-40178")
     def test_ContextVar_basics(self):
         mod = self.make_module("""
             HPyDef_METH(create_ctxvar, "create_ctxvar", create_ctxvar_impl, HPyFunc_O)

graalpython/lib-graalpython/modules/hpy/test/test_hpyerr.py

@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import pytest
 from .support import HPyTest, SUPPORTS_SYS_EXECUTABLE, trampoline
 
 
@@ -169,6 +170,7 @@ def test_HPyErr_SetFromErrno(self):
 
             assert err.value.errno == errno.EINVAL
 
+    @pytest.mark.skip(reason="GR-40178")
     def test_HPyErr_SetFromErrnoWithFilenameObjects(self):
         import pytest
         import errno
@@ -206,6 +208,7 @@ def test_HPyErr_SetFromErrnoWithFilenameObjects(self):
         assert err.value.filename == file1
         assert err.value.filename2 == file2
 
+    @pytest.mark.skip(reason="GR-40178")
     def test_HPyErr_SetFromErrnoWithFilename(self):
         import pytest
         import errno

graalpython/lib-graalpython/modules/hpy/test/test_hpyunicode.py

@@ -22,6 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import pytest
 from .support import HPyTest
 
 class TestUnicode(HPyTest):
@@ -162,6 +163,7 @@ def test_AsUTF8AndSize(self):
         assert mod.g(b'A'.decode('utf-8')) == ord('A')
         assert mod.g(b'A\0'.decode('utf-8')) == ord('A')
 
+    @pytest.mark.skip(reason="GR-40178")
     def test_DecodeLatin1(self):
         mod = self.make_module("""
             HPyDef_METH(f, "f", f_impl, HPyFunc_O)