infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-16 10:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8215625: javax/sql/testng/util/xxxxx.java tests compilation failed after JDK-8207224

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Vicente Romero 2018-12-19 14:02:19 -05:00
parent e93939f851
commit f398c3dcd2
4 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
View File

@ -189,8 +189,7 @@ public enum Source {
SWITCH_MULTIPLE_CASE_LABELS(JDK13, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL),
SWITCH_RULE(JDK13, Fragments.FeatureSwitchRules, DiagKind.PLURAL),
SWITCH_EXPRESSION(JDK13, Fragments.FeatureSwitchExpressions, DiagKind.PLURAL),
RAW_STRING_LITERALS(JDK13, Fragments.FeatureRawStringLiterals, DiagKind.PLURAL),
RETURN_TYPE_SUBSTITUTABLE_SAME_TYPE(JDK13);
RAW_STRING_LITERALS(JDK13, Fragments.FeatureRawStringLiterals, DiagKind.PLURAL);
enum DiagKind {
NORMAL,

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

@ -91,7 +91,6 @@ public class Types {
final Names names;
final boolean allowDefaultMethods;
final boolean mapCapturesToBounds;
final boolean returnTypeSustitutableSameType;
final Check chk;
final Enter enter;
JCDiagnostic.Factory diags;
@ -115,7 +114,6 @@ public class Types {
Source source = Source.instance(context);
allowDefaultMethods = Feature.DEFAULT_METHODS.allowedInSource(source);
mapCapturesToBounds = Feature.MAP_CAPTURES_TO_BOUNDS.allowedInSource(source);
returnTypeSustitutableSameType = Feature.RETURN_TYPE_SUBSTITUTABLE_SAME_TYPE.allowedInSource(source);
chk = Check.instance(context);
enter = Enter.instance(context);
capturedName = names.fromString("<captured wildcard>");
@ -4237,13 +4235,8 @@ public class Types {
return covariantReturnType(r1.getReturnType(), r2res, warner);
if (isSubtypeUnchecked(r1.getReturnType(), r2res, warner))
return true;
if (returnTypeSustitutableSameType) {
if (!isSameType(r1.getReturnType(), erasure(r2res)))
return false;
} else {
if (!isSubtype(r1.getReturnType(), erasure(r2res)))
return false;
}
if (!isSubtype(r1.getReturnType(), erasure(r2res)))
return false;
warner.warn(LintCategory.UNCHECKED);
return true;
}

28
test/langtools/tools/javac/T8207224/ReturnTypeSubstitutableTest.java
View File

@ -1,28 +0,0 @@
/*
* @test /nodynamiccopyright/
* @bug 8207224
* @summary Javac compiles source code despite illegal use of unchecked conversions
* @compile/fail/ref=ReturnTypeSubstitutableTest.out -XDrawDiagnostics ReturnTypeSubstitutableTest.java
* @compile -source 12 ReturnTypeSubstitutableTest.java
*/
class ReturnTypeSubstitutableTest {
abstract class AbstractDemo<Request extends AbstractResult, Response extends AbstractResult> {
protected abstract Response test(Request request);
}
abstract interface AbstractResult {}
abstract interface SimpleResult extends AbstractResult {}
class Result1 implements SimpleResult {}
class OtherResult implements AbstractResult {}
public class SimpleDemo<Request extends AbstractResult, Response extends AbstractResult> extends AbstractDemo<Request, Response> {
@Override
protected SimpleResult test(AbstractResult request) {
return null;
}
}
}

2
test/langtools/tools/javac/T8207224/ReturnTypeSubstitutableTest.out
View File

@ -1,2 +0,0 @@
ReturnTypeSubstitutableTest.java:24:32: compiler.err.override.incompatible.ret: (compiler.misc.cant.override: test(ReturnTypeSubstitutableTest.AbstractResult), ReturnTypeSubstitutableTest.SimpleDemo, test(Request), ReturnTypeSubstitutableTest.AbstractDemo), ReturnTypeSubstitutableTest.SimpleResult, Response
1 error