Fix atexit execution order

Author: msimacek

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

@@ -1,9 +1,12 @@
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_args
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_badargs
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_bound_methods
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_clear
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_exit
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_order
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_raise
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_shutdown
+*graalpython.lib-python.3.test.test_atexit.GeneralTest.test_stress
 *graalpython.lib-python.3.test.test_atexit.GeneralTest.test_unregister
 *graalpython.lib-python.3.test.test_atexit.SubinterpreterTest.test_callback_on_subinterpreter_teardown
 *graalpython.lib-python.3.test.test_atexit.SubinterpreterTest.test_callbacks_leak

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

@@ -121,7 +121,7 @@ Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
     abstract static class UnregisterNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object register(Object callable) {
-            getContext().deregisterAtexitHook(callable);
+            getContext().unregisterAtexitHook(callable);
             return PNone.NONE;
         }
     }
@@ -150,11 +150,7 @@ int get() {
     abstract static class RunExitfuncsNode extends PythonBuiltinNode {
         @Specialization
         Object run() {
-            try {
-                getContext().runAtexitHooks();
-            } finally {
-                getContext().clearAtexitHooks();
-            }
+            getContext().runAtexitHooks();
             return PNone.NONE;
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -50,14 +50,11 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 
-import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.options.OptionKey;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
@@ -82,6 +79,7 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.AsyncHandler.AsyncAction;
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -187,11 +185,13 @@ void reprLeave(Object item) {
     }
 
     private static final class AtExitHook {
+        final Object callable;
         final Object[] arguments;
         final PKeyword[] keywords;
         final CallTarget ct;
 
-        AtExitHook(Object[] arguments, PKeyword[] keywords, CallTarget ct) {
+        AtExitHook(Object callable, Object[] arguments, PKeyword[] keywords, CallTarget ct) {
+            this.callable = callable;
             this.arguments = arguments;
             this.keywords = keywords;
             this.ct = ct;
@@ -211,7 +211,7 @@ private static final class AtExitHook {
     private PythonModule mainModule;
     private final PythonCore core;
     private final List<ShutdownHook> shutdownHooks = new ArrayList<>();
-    private final EconomicMap<Object, AtExitHook> atExitHooks = EconomicMap.create(0);
+    private final List<AtExitHook> atExitHooks = new ArrayList<>();
     private final HashMap<PythonNativeClass, CyclicAssumption> nativeClassStableAssumptions = new HashMap<>();
     private final AtomicLong globalId = new AtomicLong(Integer.MAX_VALUE * 2L + 4L);
     private final ThreadGroup threadGroup = new ThreadGroup(GRAALPYTHON_THREADS);
@@ -717,12 +717,12 @@ public void registerAtexitHook(ShutdownHook shutdownHook) {
 
     @TruffleBoundary
     public void registerAtexitHook(Object callable, Object[] arguments, PKeyword[] keywords, CallTarget ct) {
-        atExitHooks.put(callable, new AtExitHook(arguments, keywords, ct));
+        atExitHooks.add(new AtExitHook(callable, arguments, keywords, ct));
     }
 
     @TruffleBoundary
-    public void deregisterAtexitHook(Object callable) {
-        atExitHooks.removeKey(callable);
+    public void unregisterAtexitHook(Object callable) {
+        atExitHooks.removeIf(hook -> hook.callable == callable);
     }
 
     @TruffleBoundary
@@ -745,18 +745,11 @@ public int getAtexitHookCount() {
     @TruffleBoundary
     public void runAtexitHooks() {
         // run atExitHooks in reverse order they were registered
-        MapCursor<Object, AtExitHook> cursor = atExitHooks.getEntries();
-        AtExitHook[] hooks = new AtExitHook[atExitHooks.size()];
-        Object[] callables = new Object[atExitHooks.size()];
-        for (int i = 0; i < hooks.length; i++) {
-            cursor.advance();
-            callables[i] = cursor.getKey();
-            hooks[i] = cursor.getValue();
-        }
         PException lastException = null;
-        for (int i = hooks.length - 1; i >= 0; i--) {
+        for (int i = atExitHooks.size() - 1; i >= 0; i--) {
+            AtExitHook hook = atExitHooks.get(i);
             try {
-                hooks[i].ct.call(callables[i], hooks[i].arguments, hooks[i].keywords);
+                hook.ct.call(hook.callable, hook.arguments, hook.keywords);
             } catch (PException e) {
                 lastException = e;
                 if (!IsBuiltinClassProfile.profileClassSlowPath(e.getEscapedException(), PythonBuiltinClassType.SystemExit)) {
@@ -765,6 +758,7 @@ public void runAtexitHooks() {
                 }
             }
         }
+        atExitHooks.clear();
         if (lastException != null) {
             throw lastException;
         }