[WIP][GR-40746] Fix prioritization of OSR tasks in compilation queue …

…of Truffle PullRequest: graal/19494
oracle · Dec 5, 2024 · 8459a70 · 8459a70
2 parents d4d0670 + e1fb7ae
commit 8459a70
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/CompilationTask.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/CompilationTask.java
@@ -243,8 +243,9 @@ boolean isHigherPriorityThan(CompilationTask other) {
             // Any non-compilation action (e.g. compiler init) is higher priority.
             return true;
         }
-        if (this.isOSR && other.isLastTier()) {
-            return true;
+        if ((this.isOSR ^ other.isOSR) && this.isLastTier() && other.isLastTier()) {
+            // Any OSR task has higher priority than any non-OSR last tier task
+            return this.isOSR;
         }
         int tier = tier();
         if (engineData.traversingFirstTierPriority && tier != other.tier()) {