Skip to content

Commit

Permalink
no exit safepoint if end safepoints are disabled
Browse files Browse the repository at this point in the history
(cherry picked from commit 12a86fb)
davleopo authored and elkorchi committed Dec 12, 2024
1 parent 655d0a0 commit d44a1db
Showing 2 changed files with 20 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -3824,6 +3824,7 @@ private LoopBeginNode appendLoopBegin(FixedWithNextNode fixedWithNext, int start
if (disableLoopSafepoint()) {
loopBegin.disableSafepoint(SafepointState.MUST_NEVER_SAFEPOINT);
loopBegin.disableGuestSafepoint(SafepointState.MUST_NEVER_SAFEPOINT);
loopBegin.disableLoopExitSafepoint(SafepointState.MUST_NEVER_SAFEPOINT);
}
fixedWithNext.setNext(preLoopEnd);
// Add the single non-loop predecessor of the loop header.
Original file line number Diff line number Diff line change
@@ -64,20 +64,34 @@ public static boolean needSafepointCheck(ResolvedJavaMethod method) {
return true;
}

@Override
protected void run(StructuredGraph graph, MidTierContext context) {
/**
* Determines if this (potentially special) method needs safepoint checks.
*/
public static boolean needsSafepointCheck(StructuredGraph graph) {
SharedMethod method = (SharedMethod) graph.method();
if (!method.needSafepointCheck()) {
return;
}
return method.needSafepointCheck();
}

/**
* Insert SVM specific safepoints at the method end if necessary.
*/
public static void insertMethodEndSafepoints(StructuredGraph graph, MidTierContext context) {
SharedMethod method = (SharedMethod) graph.method();
if (!((SubstrateBackend) context.getTargetProvider()).safepointCheckedInEpilogue(method)) {
/* Insert method-end safepoints. */
for (ReturnNode returnNode : graph.getNodes(ReturnNode.TYPE)) {
SafepointNode safepointNode = graph.add(new SafepointNode());
graph.addBeforeFixed(returnNode, safepointNode);
}
}
}

@Override
protected void run(StructuredGraph graph, MidTierContext context) {
if (!needsSafepointCheck(graph)) {
return;
}
insertMethodEndSafepoints(graph, context);

/* Insert loop safepoints. */
super.run(graph, context);

0 comments on commit d44a1db

Please sign in to comment.