[GR-40746] fix prioritization of OSR tasks in compilation queue of Truffle

FelixPSch · FelixPSch · commit e1fb7ae5bc10 · 2024-12-02T08:52:42.000+01:00
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()) {

Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,9 @@ boolean isHigherPriorityThan(CompilationTask other) {`
`243`	`243`	`// Any non-compilation action (e.g. compiler init) is higher priority.`
`244`	`244`	`return true;`
`245`	`245`	`}`
`246`		`- if (this.isOSR && other.isLastTier()) {`
`247`		`- return true;`
	`246`	`+ if ((this.isOSR ^ other.isOSR) && this.isLastTier() && other.isLastTier()) {`
	`247`	`+ // Any OSR task has higher priority than any non-OSR last tier task`
	`248`	`+ return this.isOSR;`
`248`	`249`	`}`
`249`	`250`	`int tier = tier();`
`250`	`251`	`if (engineData.traversingFirstTierPriority && tier != other.tier()) {`