Break exception edges when calling C API functions.

Author: fangerer

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

@@ -2459,14 +2459,12 @@ public final Object call(NativeCAPISymbol symbol, Object... args) {
         static Object doIt(NativeCAPISymbol name, Object[] args,
                         @Cached ImportCExtSymbolNode importCExtSymbolNode,
                         @CachedContext(PythonLanguage.class) PythonContext context,
-                        @CachedLibrary(limit = "1") InteropLibrary interopLibrary,
-                        @Cached PRaiseNode raiseNode) {
+                        @CachedLibrary(limit = "1") InteropLibrary interopLibrary) {
             try {
                 return interopLibrary.execute(importCExtSymbolNode.execute(context.getCApiContext(), name), args);
-            } catch (UnsupportedTypeException | ArityException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, e);
-            } catch (UnsupportedMessageException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, ErrorMessages.CAPI_SYM_NOT_CALLABLE, name);
+            } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+                // consider these exceptions to be fatal internal errors
+                throw CompilerDirectives.shouldNotReachHere(e);
             }
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtCommonNodes.java

@@ -152,51 +152,51 @@ public abstract static class ImportCExtSymbolNode extends PNodeWithContext {
         public abstract Object execute(CExtContext nativeContext, NativeCExtSymbol symbol);
 
         @Specialization(guards = "cachedSymbol == symbol", limit = "1", assumptions = "singleContextAssumption()")
-        @SuppressWarnings("unused")
-        static Object doSymbolCached(CExtContext nativeContext, NativeCExtSymbol symbol,
-                        @Cached("symbol") NativeCExtSymbol cachedSymbol,
-                        @Shared("raiseNode") @Cached PRaiseNode raiseNode,
-                        @Cached("importCAPISymbolUncached(nativeContext, raiseNode, symbol)") Object llvmSymbol) {
+        static Object doSymbolCached(@SuppressWarnings("unused") CExtContext nativeContext, @SuppressWarnings("unused") NativeCExtSymbol symbol,
+                        @Cached("symbol") @SuppressWarnings("unused") NativeCExtSymbol cachedSymbol,
+                        @Cached("importCAPISymbolUncached(nativeContext, symbol)") Object llvmSymbol) {
             return llvmSymbol;
         }
 
         // n.b. if 'singleContextAssumption' is valid, we may also cache the native context
         @Specialization(guards = "nativeContext == cachedNativeContext", limit = "1", //
                         assumptions = "singleContextAssumption()", //
                         replaces = "doSymbolCached")
-        @SuppressWarnings("unused")
-        static Object doWithSymbolCacheSingleContext(CExtContext nativeContext, NativeCExtSymbol symbol,
+        Object doWithSymbolCacheSingleContext(@SuppressWarnings("unused") CExtContext nativeContext, NativeCExtSymbol symbol,
                         @Cached("nativeContext") CExtContext cachedNativeContext,
                         @Cached("nativeContext.getSymbolCache()") DynamicObject cachedSymbolCache,
-                        @CachedLibrary("cachedSymbolCache") DynamicObjectLibrary dynamicObjectLib,
-                        @Shared("raiseNode") @Cached PRaiseNode raiseNode,
-                        @Cached("importCAPISymbolUncached(nativeContext, raiseNode, symbol)") Object sym) {
-            return doWithSymbolCache(cachedNativeContext, symbol, cachedSymbolCache, dynamicObjectLib, raiseNode);
+                        @CachedLibrary("cachedSymbolCache") DynamicObjectLibrary dynamicObjectLib) {
+            return doWithSymbolCache(cachedNativeContext, symbol, cachedSymbolCache, dynamicObjectLib);
         }
 
         @Specialization(replaces = {"doSymbolCached", "doWithSymbolCacheSingleContext"}, limit = "1")
-        static Object doWithSymbolCache(CExtContext nativeContext, NativeCExtSymbol symbol,
+        Object doWithSymbolCache(CExtContext nativeContext, NativeCExtSymbol symbol,
                         @Bind("nativeContext.getSymbolCache()") DynamicObject symbolCache,
-                        @CachedLibrary("symbolCache") DynamicObjectLibrary dynamicObjectLib,
-                        @Shared("raiseNode") @Cached PRaiseNode raiseNode) {
+                        @CachedLibrary("symbolCache") DynamicObjectLibrary dynamicObjectLib) {
             Object nativeSymbol = dynamicObjectLib.getOrDefault(symbolCache, symbol, PNone.NO_VALUE);
             if (nativeSymbol == PNone.NO_VALUE) {
-                CompilerDirectives.transferToInterpreter();
-                nativeSymbol = importCAPISymbolUncached(nativeContext, raiseNode, symbol);
-                dynamicObjectLib.put(symbolCache, symbol, nativeSymbol);
+                nativeSymbol = importCAPISymbolUncached(nativeContext, symbol, symbolCache, dynamicObjectLib);
             }
             return nativeSymbol;
         }
 
-        protected static Object importCAPISymbolUncached(CExtContext nativeContext, PRaiseNode raiseNode, NativeCExtSymbol symbol) {
+        protected Object importCAPISymbolUncached(CExtContext nativeContext, NativeCExtSymbol symbol) {
+            CompilerAsserts.neverPartOfCompilation();
+            return importCAPISymbolUncached(nativeContext, symbol, nativeContext.getSymbolCache(), DynamicObjectLibrary.getUncached());
+        }
+
+        @TruffleBoundary
+        protected Object importCAPISymbolUncached(CExtContext nativeContext, NativeCExtSymbol symbol, DynamicObject symbolCache, DynamicObjectLibrary dynamicObjectLib) {
             Object llvmLibrary = nativeContext.getLLVMLibrary();
             String name = symbol.getName();
             try {
-                return InteropLibrary.getUncached().readMember(llvmLibrary, name);
+                Object nativeSymbol = InteropLibrary.getUncached().readMember(llvmLibrary, name);
+                dynamicObjectLib.put(symbolCache, symbol, nativeSymbol);
+                return nativeSymbol;
             } catch (UnknownIdentifierException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.SystemError, ErrorMessages.INVALID_CAPI_FUNC, name);
+                throw PRaiseNode.raiseUncached(this, PythonBuiltinClassType.SystemError, ErrorMessages.INVALID_CAPI_FUNC, name);
             } catch (UnsupportedMessageException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.SystemError, ErrorMessages.CORRUPTED_CAPI_LIB_OBJ, llvmLibrary);
+                throw PRaiseNode.raiseUncached(this, PythonBuiltinClassType.SystemError, ErrorMessages.CORRUPTED_CAPI_LIB_OBJ, llvmLibrary);
             }
         }
     }