infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 05:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

8144066: StackOverflowException when computing glb

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Dan Smith 2017-01-03 16:27:54 -07:00
parent f8ccef1982
commit 342a27ab58
3 changed files with 95 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3845,20 +3845,26 @@ public class Types {
return bounds.head;
} else { // length > 1
int classCount = 0;
List<Type> cvars = List.nil();
List<Type> lowers = List.nil();
for (Type bound : bounds) {
if (!bound.isInterface()) {
classCount++;
Type lower = cvarLowerBound(bound);
if (bound != lower && !lower.hasTag(BOT))
lowers = insert(lowers, lower);
if (bound != lower && !lower.hasTag(BOT)) {
cvars = cvars.append(bound);
lowers = lowers.append(lower);
}
}
}
if (classCount > 1) {
if (lowers.isEmpty())
if (lowers.isEmpty()) {
return createErrorType(errT);
else
return glbFlattened(union(bounds, lowers), errT);
} else {
// try again with lower bounds included instead of capture variables
List<Type> newBounds = bounds.diff(cvars).appendList(lowers);
return glb(newBounds);
}
}
}
return makeIntersectionType(bounds);

42
langtools/test/tools/javac/generics/inference/CaptureGLB1.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8144066
* @summary GLB of two lower-bounded capture variables, bounded by related array types
* @compile CaptureGLB1.java
*/
public class CaptureGLB1 {
interface A<T> { }
Exception[] bar(A<? super Exception[]> x, A<? super Throwable[]> y){
return foo(x, y);
}
<T> T foo(A<? super T> x, A<? super T> y){
return null;
}
}

42
langtools/test/tools/javac/generics/inference/CaptureGLB2.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8144066
* @summary GLB of two lower-bounded capture variables, bounded by related wildcard-parameterized types
* @compile CaptureGLB2.java
*/
public class CaptureGLB2 {
interface A<T> { }
Class<?> bar(A<? super Class<? extends Exception>> x, A<? super Class<? extends Throwable>> y){
return foo(x, y);
}
<T> T foo(A<? super T> x, A<? super T> y){
return null;
}
}