stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189838: Stack overflow when computing upward projection of an intersection type with fbounds

Browse Source 
Bad logic for detecting loop in type-variable upper bounds

Reviewed-by: vromero
This commit is contained in:
Maurizio Cimadamore 2017-10-26 18:42:40 +01:00
parent 79a0feb9f3
commit f48f3c6552
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
View File

@ -292,8 +292,8 @@ public class Types {
@Override
public Type visitTypeVar(TypeVar t, ProjectionKind pkind) {
if (vars.contains(t)) {
try {
if (seen.add(t)) {
if (seen.add(t)) {
try {
final Type bound;
switch (pkind) {
case UPWARDS:
@ -309,12 +309,13 @@ public class Types {
return null;
}
return bound.map(this, pkind);
} else {
//cycle
return syms.objectType;
} finally {
seen.remove(t);
}
} finally {
seen.remove(t);
} else {
//cycle
return pkind == ProjectionKind.UPWARDS ?
syms.objectType : syms.botType;
}
} else {
return t;

13
test/langtools/tools/javac/lvti/harness/NonDenotableTest.java
View File

@ -25,7 +25,7 @@
/*
* @test
* @bug 8177466
* @bug 8177466 8189838
* @summary Add compiler support for local variable type-inference
* @modules jdk.compiler/com.sun.source.tree
* jdk.compiler/com.sun.source.util
@ -50,6 +50,7 @@ class NonDenotableTest {
static final String LIST_EXT_COMP_UNB = "java.util.List<? extends java.lang.Comparable<?>>";
static final String LIST_SUP_COMP_UNB = "java.util.List<? super java.lang.Comparable<?>>";
static final String INT_INTEGER_DOUBLE = "#INT(java.lang.Number,java.lang.Comparable<? extends java.lang.Number&java.lang.Comparable<?>>)";
static final String SEL_INT_ENUM_SEL = "NonDenotableTest.Selector<? extends #INT(java.lang.Enum<?>,NonDenotableTest.Selector<?>)>";
void testExtends() {
@InferredType(LIST_EXT)
@ -120,6 +121,14 @@ class NonDenotableTest {
for (@InferredType(INT_INTEGER_DOUBLE) var s2 : listOf(choose(1, 1L))) { break; }
}
void testIntersection(Selector<?> s) {
@InferredType(SEL_INT_ENUM_SEL)
var c = s;
for (@InferredType(SEL_INT_ENUM_SEL) var s2 = s ; ;) { break; }
for (@InferredType(SEL_INT_ENUM_SEL) var s2 : arrayOf(s)) { break; }
for (@InferredType(SEL_INT_ENUM_SEL) var s2 : listOf(s)) { break; }
}
List<? extends String> extString() { return null; }
List<? super String> supString() { return null; }
List<?> unbString() { return null; }
@ -145,4 +154,6 @@ class NonDenotableTest {
<Z> Z[] arrayOf(Z z) { return null; }
<Z> Z choose(Z z1, Z z2) { return z1; }
interface Selector<E extends Enum<E> & Selector<E>> {}
}