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

[FIR] Use flexible type lower bound when approximating type for

Browse Source 
IntegerLiteral.
This commit is contained in:
Mark Punzalan
2020-05-18 15:07:03 -07:00
committed by Mikhail Glukhikh
parent d5141674a3
commit 425ce8c3ab
7 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/ConeIntegerLiteralTypeImpl.kt
+2 -2
View File
@@ -61,9 +61,9 @@ class ConeIntegerLiteralTypeImpl : ConeIntegerLiteralType {
} }
override fun getApproximatedType(expectedType: ConeKotlinType?): ConeClassLikeType { override fun getApproximatedType(expectedType: ConeKotlinType?): ConeClassLikeType {
val approximatedType = when (expectedType) { val approximatedType = when (val expectedTypeForApproximation = expectedType?.lowerBoundIfFlexible()) {
null, !in possibleTypes -> possibleTypes.first() null, !in possibleTypes -> possibleTypes.first()
else -> expectedType as ConeClassLikeType else -> expectedTypeForApproximation as ConeClassLikeType
} }
return approximatedType.withNullability(nullability) return approximatedType.withNullability(nullability)
} }
compiler/testData/codegen/box/controlStructures/continueInFor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
fun for_int_range(): Int { fun for_int_range(): Int {
var c = 0 var c = 0
compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
fun for_int_range(): Int { fun for_int_range(): Int {
var c = 0 var c = 0
compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
operator fun Long.component1() = this + 1 operator fun Long.component1() = this + 1
operator fun Long.component2() = this + 2 operator fun Long.component2() = this + 2
compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
operator fun Long.component1() = this + 1 operator fun Long.component1() = this + 1
operator fun Long.component2() = this + 2 operator fun Long.component2() = this + 2
compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
class M { class M {
operator fun Long.component1() = this + 1 operator fun Long.component1() = this + 1
compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
class M { class M {
operator fun Long.component1() = this + 1 operator fun Long.component1() = this + 1