Skip to content

Commit 817dbb7

Browse files
chumerbulasevich
authored andcommitted
Fix return type compatibility check can lead to void specializations being filtered.
(cherry picked from commit 4ff4aa89a7da5ed2e97739cec9b200f8a8af1516)
1 parent adf733c commit 817dbb7

File tree

2 files changed

+108
-5
lines changed
  • truffle/src

2 files changed

+108
-5
lines changed
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.api.dsl.test;
42+
43+
import static org.junit.Assert.assertEquals;
44+
45+
import org.junit.Test;
46+
47+
import com.oracle.truffle.api.dsl.Cached;
48+
import com.oracle.truffle.api.dsl.GenerateInline;
49+
import com.oracle.truffle.api.dsl.NeverDefault;
50+
import com.oracle.truffle.api.dsl.Specialization;
51+
import com.oracle.truffle.api.dsl.test.GR62540TestFactory.TestVoidSpecializationNodeGen;
52+
import com.oracle.truffle.api.nodes.Node;
53+
54+
public class GR62540Test {
55+
56+
@Test
57+
public void testFallthrough0() {
58+
TestVoidSpecialization node = TestVoidSpecializationNodeGen.create();
59+
node.execute(0);
60+
node.execute(0); // not failing
61+
}
62+
63+
abstract static class BaseNode extends Node {
64+
65+
abstract Object execute(int i);
66+
67+
void executeVoid(int i) {
68+
execute(i);
69+
}
70+
}
71+
72+
@GenerateInline(false)
73+
@SuppressWarnings("unused")
74+
abstract static class TestVoidSpecialization extends BaseNode {
75+
76+
int cached = 1;
77+
78+
@NeverDefault
79+
int incCached() {
80+
return cached++;
81+
}
82+
83+
@Specialization(guards = "i==0")
84+
void s0(int i, @Cached("incCached()") int incCached) {
85+
/*
86+
* If cached is not 2 then executeAndSpecialize was called more than once.
87+
*/
88+
assertEquals(2, cached);
89+
}
90+
91+
@Specialization(guards = "i==1")
92+
Object s1(int i) {
93+
return null;
94+
}
95+
96+
}
97+
98+
}

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,17 +2682,22 @@ private List<SpecializationData> filterCompatibleSpecializations(Collection<Spec
26822682
}
26832683
}
26842684

2685-
TypeMirror returnType = forType.getReturnType();
2686-
if (!isVoid(returnType) && !isSubtypeBoxed(context, specialization.getReturnType().getType(), returnType) &&
2687-
!isSubtypeBoxed(context, returnType, specialization.getReturnType().getType())) {
2688-
continue outer;
2685+
TypeMirror executeReturnType = forType.getReturnType();
2686+
TypeMirror specializationReturnType = specialization.getReturnType().getType();
2687+
if (isReturnTypeCompatible(executeReturnType, specializationReturnType)) {
2688+
filteredSpecializations.add(specialization);
26892689
}
2690-
filteredSpecializations.add(specialization);
26912690
}
26922691

26932692
return filteredSpecializations;
26942693
}
26952694

2695+
private boolean isReturnTypeCompatible(TypeMirror executeReturnType, TypeMirror specializationReturnType) {
2696+
return isVoid(executeReturnType) || isVoid(specializationReturnType) || //
2697+
isSubtypeBoxed(context, specializationReturnType, executeReturnType) ||
2698+
isSubtypeBoxed(context, executeReturnType, specializationReturnType);
2699+
}
2700+
26962701
private List<SpecializationData> filterImplementedSpecializations(List<SpecializationData> specializations, TypeMirror expectedReturnType) {
26972702
List<SpecializationData> filteredSpecializations = new ArrayList<>();
26982703
TypeMirror returnType = boxType(context, expectedReturnType);

0 commit comments

Comments
 (0)