azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not get supertypes of Nothing

Browse Source 
(exception EA-37833)
This commit is contained in:
Svetlana Isakova
2012-08-22 12:34:57 +04:00
parent 11fdeac930
commit 5779ac15c0
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
+3
View File
@@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure;
import org.jetbrains.jet.lang.resolve.calls.inference.TypeConstraintsImpl.ConstraintKind;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import java.util.*;
@@ -190,6 +191,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
}
switch (constraintKind) {
case SUPER_TYPE: {
if (JetStandardClasses.isNothingOrNullableNothing(constrainingType)) break;
JetType correspondingSupertype = TypeCheckingProcedure.findCorrespondingSupertype(constrainingType, subjectType);
if (correspondingSupertype != null) {
constrainingType = correspondingSupertype;
@@ -197,6 +199,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
break;
}
case SUB_TYPE: {
if (JetStandardClasses.isNothingOrNullableNothing(subjectType)) break;
JetType correspondingSupertype = TypeCheckingProcedure.findCorrespondingSupertype(subjectType, constrainingType);
if (correspondingSupertype != null) {
subjectType = correspondingSupertype;
compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
+14
View File
@@ -0,0 +1,14 @@
package d
trait A<T>
fun infer<T>(<!UNUSED_PARAMETER!>a<!>: A<T>) : T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
fun test(nothing: Nothing?) {
val <!UNUSED_VARIABLE!>i<!> = <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>infer<!>(nothing)
}
fun sum(<!UNUSED_PARAMETER!>a<!> : IntArray) : Int {
for (<!UNREACHABLE_CODE!>n<!><!SYNTAX!><!>
<!ITERATOR_AMBIGUITY!>return <!TYPE_MISMATCH!>"?"<!><!><!SYNTAX!><!>
<!SYNTAX!><!>}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5
View File
@@ -1304,6 +1304,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt");
}
@TestMetadata("checkNothingIsSubtype.kt")
public void testCheckNothingIsSubtype() throws Exception {
doTest("compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt");
}
@TestMetadata("incompleteAssignment.kt")
public void testIncompleteAssignment() throws Exception {
doTest("compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt");