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

[FIR] Fix Definitely Not Null type substitution

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-11-28 16:16:05 +03:00
parent e5f60253f7
commit 2f9c94bd9e
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt
+1 -1
View File
@@ -87,7 +87,7 @@ abstract class AbstractConeSubstitutor : ConeSubstitutor() {
} }
private fun ConeDefinitelyNotNullType.substituteOriginal(): ConeDefinitelyNotNullType? { private fun ConeDefinitelyNotNullType.substituteOriginal(): ConeDefinitelyNotNullType? {
return ConeDefinitelyNotNullType.create(substituteType(original)?.withNullability(ConeNullability.NOT_NULL) ?: original) return ConeDefinitelyNotNullType.create(substituteOrNull(original)?.withNullability(ConeNullability.NOT_NULL) ?: original)
} }
private fun ConeFlexibleType.substituteBounds(): ConeFlexibleType? { private fun ConeFlexibleType.substituteBounds(): ConeFlexibleType? {
compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.kt
Vendored
+2 -3
View File
@@ -32,8 +32,7 @@ public class DiagnosticFactory<D extends EmptyDiagnostic> {
} }
// FILE: DiagnosticFactory0.java // FILE: DiagnosticFactory0.java
public class DiagnosticFactory0<E extends Element> extends DiagnosticFactory<Diagnostic<E>> {}
public class DiagnosticFactory0<E extends Element> extends DiagnosticFactory<Diagnostic> {}
// FILE: test.kt // FILE: test.kt
@@ -54,5 +53,5 @@ private val DERIVED_FACTORY = DiagnosticFactory0<DerivedElement>()
fun createViaFactory(d: EmptyDiagnostic) { fun createViaFactory(d: EmptyDiagnostic) {
val casted = DERIVED_FACTORY.cast(d) val casted = DERIVED_FACTORY.cast(d)
val element = casted.element val element = casted.element
<!INAPPLICABLE_CANDIDATE!>Fix<!>(element) Fix(element)
} }
compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.txt
Vendored
+3 -3
View File
@@ -16,7 +16,7 @@ FILE: test.kt
private final val DERIVED_FACTORY: R|DiagnosticFactory0<DerivedElement>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|DerivedElement|>() private final val DERIVED_FACTORY: R|DiagnosticFactory0<DerivedElement>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|DerivedElement|>()
private get(): R|DiagnosticFactory0<DerivedElement>| private get(): R|DiagnosticFactory0<DerivedElement>|
public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| { public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| {
lval casted: R|Diagnostic<*>!| = R|/DERIVED_FACTORY|.R|FakeOverride</DiagnosticFactory.cast: R|Diagnostic<*>!|>|(R|<local>/d|) lval casted: R|Diagnostic<DerivedElement>!| = R|/DERIVED_FACTORY|.R|FakeOverride</DiagnosticFactory.cast: R|Diagnostic<DerivedElement>!|>|(R|<local>/d|)
lval element: R|Element!| = R|<local>/casted|.R|/Diagnostic.element| lval element: R|DerivedElement!| = R|<local>/casted|.R|/Diagnostic.element|
<Inapplicable(INAPPLICABLE): [/Fix.Fix]>#(R|<local>/element|) R|/Fix.Fix|(R|<local>/element|)
} }