[GR-65045] Fix shared arena support for layers.

PullRequest: graal/20862

Author: davleopo

substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java

@@ -664,6 +664,10 @@ protected void initSafeArenaAccessors(BeforeAnalysisAccessImpl access) throws No
         registerSafeArenaAccessorMethod(metaAccess, ReflectionUtil.lookupMethod(mappedMemoryUtils, "isLoaded", long.class, boolean.class, long.class));
         registerSafeArenaAccessorMethod(metaAccess, ReflectionUtil.lookupMethod(mappedMemoryUtils, "unload", long.class, boolean.class, long.class));
         registerSafeArenaAccessorMethod(metaAccess, ReflectionUtil.lookupMethod(SubstrateMappedMemoryUtils.class, "load", long.class, boolean.class, long.class));
+
+        // the actual method checking a valid session state (if not inlined) is also safe as this
+        // one would yield the error
+        registerSafeArenaAccessorMethod(metaAccess, ReflectionUtil.lookupMethod(MemorySessionImpl.class, "checkValidStateRaw"));
     }
 
     protected void registerSafeArenaAccessorClass(MetaAccessProvider metaAccess, Class<?> klass) {

substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/phases/SubstrateOptimizeSharedArenaAccessPhase.java

@@ -645,10 +645,9 @@ private static EconomicSet<DominatedCall> insertSessionChecks(StructuredGraph gr
         // Compute the graph with all the necessary data about scoped memory accesses.
         EconomicSet<DominatedCall> calls = EconomicSet.create();
         EconomicMap<Node, List<ScopedAccess>> sugaredGraph = enumerateScopedAccesses(cfg, context, calls);
-        if (sugaredGraph == null) {
-            return null;
+        if (sugaredGraph != null) {
+            ReentrantBlockIterator.apply(new MinimalSessionChecks(graph, sugaredGraph, cfg, calls), cfg.getStartBlock());
         }
-        ReentrantBlockIterator.apply(new MinimalSessionChecks(graph, sugaredGraph, cfg, calls), cfg.getStartBlock());
         return calls;
     }
 
@@ -754,16 +753,6 @@ protected NodeBitMap cloneState(NodeBitMap oldState) {
      * are not needed any more.
      */
     private void cleanupClusterNodes(StructuredGraph graph, MidTierContext context, EconomicSet<DominatedCall> calls) {
-        if (VERIFY_NO_DOMINATED_CALLS) {
-            if (calls != null) {
-                for (DominatedCall call : calls) {
-                    if (call.invoke.isAlive()) {
-                        throw GraalError.shouldNotReachHere("After inserting all session checks call " + call.invoke + " was not inlined and could access a session");
-                    }
-                }
-            }
-        }
-
         for (MemoryArenaValidInScopeNode scopeNode : graph.getNodes().filter(MemoryArenaValidInScopeNode.class).snapshot()) {
             scopeNode.delete(0);
         }
@@ -775,6 +764,17 @@ private void cleanupClusterNodes(StructuredGraph graph, MidTierContext context,
         }
         canonicalizer.apply(graph, context);
         scheduleVerify(graph);
+
+        if (VERIFY_NO_DOMINATED_CALLS) {
+            if (calls != null) {
+                for (DominatedCall call : calls) {
+                    if (call.invoke.isAlive()) {
+                        throw GraalError.shouldNotReachHere("After inserting all session checks call " + call.invoke + " was not inlined and could access a session");
+                    }
+                }
+            }
+        }
+
     }
 
     /**