Profile if an error occurred

Author: fangerer

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

@@ -3620,6 +3620,7 @@ static boolean checkLayout(Object moduleDef, InteropLibrary moduleDefLib) {
         static Object doGeneric(CApiContext capiContext, ModuleSpec moduleSpec, PythonAbstractNativeObject moduleDefWrapper,
                         @CachedLanguage PythonLanguage language,
                         @Cached PythonObjectFactory factory,
+                        @Cached ConditionProfile errOccurredProfile,
                         @Cached GetSulongTypeNode getSulongTypeNode,
                         @Cached PCallCapiFunction callAttachTypeNode,
                         @Cached PCallCapiFunction callGetterNode,
@@ -3699,9 +3700,8 @@ static Object doGeneric(CApiContext capiContext, ModuleSpec moduleSpec, PythonAb
                 Object[] cArguments = new Object[]{moduleSpecToNativeNode.execute(capiContext, moduleSpec.originalModuleSpec), moduleDef};
                 try {
                     Object result = interopLib.execute(createFunction, cArguments);
-                    DefaultCheckFunctionResultNode.checkFunctionResult(mName, interopLib.isNull(result), false, language, capiContext.getContext(), raiseNode, factory,
-                                    CREATION_FAILD_WITHOUT_EXCEPTION,
-                                    CREATION_RAISED_EXCEPTION);
+                    DefaultCheckFunctionResultNode.checkFunctionResult(mName, interopLib.isNull(result), false, language, capiContext.getContext(), raiseNode, factory, errOccurredProfile,
+                                    CREATION_FAILD_WITHOUT_EXCEPTION, CREATION_RAISED_EXCEPTION);
                     module = toJavaNode.execute(capiContext, result);
 
                     /*
@@ -3773,6 +3773,7 @@ public abstract static class ExecModuleNode extends MultiPhaseExtensionModuleIni
         static int doGeneric(CApiContext capiContext, PythonModule module, Object moduleDef,
                         @CachedLanguage PythonLanguage language,
                         @Cached PythonObjectFactory factory,
+                        @Cached ConditionProfile errOccurredProfile,
                         @Cached ModuleGetNameNode getNameNode,
                         @Cached PCallCapiFunction callGetterNode,
                         @Cached WriteNativeMemberNode writeNativeMemberNode,
@@ -3837,7 +3838,7 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                              * and won't ignore this if no error is set. This is then the same
                              * behaviour if we would have a pointer return type and got 'NULL'.
                              */
-                            DefaultCheckFunctionResultNode.checkFunctionResult(mName, iResult != 0, false, language, capiContext.getContext(), raiseNode, factory,
+                            DefaultCheckFunctionResultNode.checkFunctionResult(mName, iResult != 0, false, language, capiContext.getContext(), raiseNode, factory, errOccurredProfile,
                                             EXECUTION_FAILED_WITHOUT_EXCEPTION, EXECUTION_RAISED_EXCEPTION);
                             break;
                         default:

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

@@ -1698,57 +1698,63 @@ static Object doNativeWrapper(PythonContext context, String name, DynamicObjectN
         static Object doPrimitiveWrapper(PythonContext context, String name, @SuppressWarnings("unused") PythonNativeWrapper result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
-            checkFunctionResult(name, false, false, language, context, raise, factory);
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, false, false, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
         @Specialization(guards = "isNoValue(result)")
         static Object doNoValue(PythonContext context, String name, @SuppressWarnings("unused") PNone result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
-            checkFunctionResult(name, true, false, language, context, raise, factory);
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, true, false, language, context, raise, factory, errOccurredProfile);
             return PNone.NO_VALUE;
         }
 
         @Specialization(guards = "!isNoValue(result)")
         static Object doPythonObject(PythonContext context, String name, @SuppressWarnings("unused") PythonAbstractObject result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
-            checkFunctionResult(name, false, false, language, context, raise, factory);
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, false, false, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
         @Specialization
         static Object doPythonNativeNull(PythonContext context, String name, @SuppressWarnings("unused") PythonNativeNull result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
-            checkFunctionResult(name, true, false, language, context, raise, factory);
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, true, false, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
         @Specialization
         static int doInteger(PythonContext context, String name, int result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
             // If the native functions returns a primitive int, only a value '-1' indicates an
             // error.
-            checkFunctionResult(name, result == -1, true, language, context, raise, factory);
+            checkFunctionResult(name, result == -1, true, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
         @Specialization
         static long doLong(PythonContext context, String name, long result,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
             // If the native functions returns a primitive int, only a value '-1' indicates an
             // error.
-            checkFunctionResult(name, result == -1, true, language, context, raise, factory);
+            checkFunctionResult(name, result == -1, true, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
@@ -1764,15 +1770,16 @@ static Object doForeign(PythonContext context, String name, Object result,
                         @Exclusive @CachedLibrary(limit = "3") InteropLibrary lib,
                         @Shared("language") @CachedLanguage PythonLanguage language,
                         @Shared("fact") @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
-            checkFunctionResult(name, isNullProfile.profile(lib.isNull(result)), false, language, context, raise, factory);
+                        @Shared("raise") @Cached PRaiseNode raise,
+                        @Shared("errOccurredProfile") @Cached ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, isNullProfile.profile(lib.isNull(result)), false, language, context, raise, factory, errOccurredProfile);
             return result;
         }
 
         private static void checkFunctionResult(String name, boolean indicatesError, boolean isPrimitiveResult, PythonLanguage language, PythonContext context, PRaiseNode raise,
-                        PythonObjectFactory factory) {
-            checkFunctionResult(name, indicatesError, isPrimitiveResult, language, context, raise, factory, ErrorMessages.RETURNED_NULL_WO_SETTING_ERROR,
-                            ErrorMessages.RETURNED_RESULT_WITH_ERROR_SET);
+                        PythonObjectFactory factory, ConditionProfile errOccurredProfile) {
+            checkFunctionResult(name, indicatesError, isPrimitiveResult, language, context, raise, factory, errOccurredProfile,
+                            ErrorMessages.RETURNED_NULL_WO_SETTING_ERROR, ErrorMessages.RETURNED_RESULT_WITH_ERROR_SET);
         }
 
         /**
@@ -1791,16 +1798,18 @@ private static void checkFunctionResult(String name, boolean indicatesError, boo
          * @param context The Python context.
          * @param raise A raise node to raise {@code SystemError}s.
          * @param factory A factory to create a base exception object.
+         * @param errOccurredProfile Profiles if a Python exception occurred and is set in the
+         *            context.
          * @param nullButNoErrorMessage Error message used if the value indicates an error and is
          *            not primitive but no error was set.
          * @param resultWithErrorMessage Error message used if an error was set but the value does
          *            not indicate and error.
          */
         static void checkFunctionResult(String name, boolean indicatesError, boolean isPrimitiveResult, PythonLanguage language, PythonContext context, PRaiseNode raise,
-                        PythonObjectFactory factory, String nullButNoErrorMessage, String resultWithErrorMessage) {
+                        PythonObjectFactory factory, ConditionProfile errOccurredProfile, String nullButNoErrorMessage, String resultWithErrorMessage) {
             PythonThreadState threadState = context.getThreadState(language);
             PException currentException = threadState.getCurrentException();
-            boolean errOccurred = currentException != null;
+            boolean errOccurred = errOccurredProfile.profile(currentException != null);
             if (indicatesError) {
                 // consume exception
                 threadState.setCurrentException(null);