archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8016177: structural most specific and stuckness

Browse source 
Reviewed-by: jjg, vromero
This commit is contained in:
Maurizio Cimadamore 2013-09-02 22:38:36 +01:00 • committed by Vicente Romero
parent 4337286502
commit 0382c78ff1
76 changed files with 1377 additions and 668 deletions
Download patch file Download diff file Expand all files Collapse all files

20
langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
View file

@ -197,7 +197,7 @@ public class StructuralMostSpecificTest
"class Test {\n" +
" void m(SAM1 s) { }\n" +
" void m(SAM2 s) { }\n" +
" { m(x->{ #LR }); }\n" +
" { m((#A1 x)->{ #LR }); }\n" +
"}\n";
String source;
@ -236,14 +236,17 @@ public class StructuralMostSpecificTest
void check() {
checkCount.incrementAndGet();
if (ak1 != ak2)
return;
if (!lrk.compatibleWith(rt1) || !lrk.compatibleWith(rt2))
return;
if (lrk.needsConversion(rt1) != lrk.needsConversion(rt2))
return;
boolean m1MoreSpecific = moreSpecific(rt1, rt2, ek1, ek2, ak1, ak2);
boolean m2MoreSpecific = moreSpecific(rt2, rt1, ek2, ek1, ak2, ak1);
boolean m1MoreSpecific = rt1.moreSpecificThan(rt2);
boolean m2MoreSpecific = rt2.moreSpecificThan(rt1);
boolean ambiguous = (m1MoreSpecific == m2MoreSpecific);
@ -268,17 +271,6 @@ public class StructuralMostSpecificTest
}
}
boolean moreSpecific(RetTypeKind rk1, RetTypeKind rk2, ExceptionKind ek1,
ExceptionKind ek2, ArgTypeKind ak1, ArgTypeKind ak2) {
if (!rk1.moreSpecificThan(rk2))
return false;
if (ak1 != ak2)
return false;
return true;
}
static class DiagnosticChecker
implements javax.tools.DiagnosticListener<JavaFileObject> {