Skip to content

Commit 857e87b

Browse files
committed
check remaining calls after removing the session checks, can be we are
not inlining some allowed calls but they are dead
1 parent 381adbb commit 857e87b

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -754,16 +754,6 @@ protected NodeBitMap cloneState(NodeBitMap oldState) {
754754
* are not needed any more.
755755
*/
756756
private void cleanupClusterNodes(StructuredGraph graph, MidTierContext context, EconomicSet<DominatedCall> calls) {
757-
if (VERIFY_NO_DOMINATED_CALLS) {
758-
if (calls != null) {
759-
for (DominatedCall call : calls) {
760-
if (call.invoke.isAlive()) {
761-
throw GraalError.shouldNotReachHere("After inserting all session checks call " + call.invoke + " was not inlined and could access a session");
762-
}
763-
}
764-
}
765-
}
766-
767757
for (MemoryArenaValidInScopeNode scopeNode : graph.getNodes().filter(MemoryArenaValidInScopeNode.class).snapshot()) {
768758
scopeNode.delete(0);
769759
}
@@ -775,6 +765,17 @@ private void cleanupClusterNodes(StructuredGraph graph, MidTierContext context,
775765
}
776766
canonicalizer.apply(graph, context);
777767
scheduleVerify(graph);
768+
769+
if (VERIFY_NO_DOMINATED_CALLS) {
770+
if (calls != null) {
771+
for (DominatedCall call : calls) {
772+
if (call.invoke.isAlive()) {
773+
throw GraalError.shouldNotReachHere("After inserting all session checks call " + call.invoke + " was not inlined and could access a session");
774+
}
775+
}
776+
}
777+
}
778+
778779
}
779780

780781
/**

0 commit comments

Comments
 (0)