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

KTIJ-24768 Fix IllegalArgumentException in KtType.isPrimitiveBacked

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2023-03-10 11:03:45 +00:00
committed by Space Team
parent 8d1cfe0017
commit 164cbc9968
16 changed files with 93 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtJvmTypeMapper.kt
+7
View File
@@ -12,6 +12,7 @@ import org.jetbrains.org.objectweb.asm.Type
public abstract class KtJvmTypeMapper : KtAnalysisSessionComponent() {
public abstract fun mapTypeToJvmType(type: KtType, mode: TypeMappingMode): Type
public abstract fun isPrimitiveBacked(type: KtType): Boolean
}
public interface KtJvmTypeMapperMixIn : KtAnalysisSessionMixIn {
@@ -22,4 +23,10 @@ public interface KtJvmTypeMapperMixIn : KtAnalysisSessionMixIn {
*/
public fun KtType.mapTypeToJvmType(mode: TypeMappingMode = TypeMappingMode.DEFAULT): Type =
withValidityAssertion { analysisSession.jvmTypeMapper.mapTypeToJvmType(this, mode) }
/**
* Returns true if the type is backed by a single JVM primitive type
*/
public val KtType.isPrimitiveBacked: Boolean
get() = withValidityAssertion { analysisSession.jvmTypeMapper.isPrimitiveBacked(this) }
}
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtTypeInfoProvider.kt
-11
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.org.objectweb.asm.Type
public abstract class KtTypeInfoProvider : KtAnalysisSessionComponent() {
public abstract fun isFunctionalInterfaceType(type: KtType): Boolean
@@ -144,16 +143,6 @@ public interface KtTypeInfoProviderMixIn : KtAnalysisSessionMixIn {
return this.classId in DefaultTypeClassIds.PRIMITIVES
}
context(KtJvmTypeMapperMixIn)
public val KtType.isPrimitiveBacked: Boolean
get() = withValidityAssertion {
if (this !is KtNonErrorClassType) return false
return when (this.mapTypeToJvmType().sort) {
Type.BOOLEAN, Type.CHAR, Type.BYTE, Type.SHORT, Type.INT, Type.FLOAT, Type.LONG, Type.DOUBLE -> true
else -> false
}
}
public val KtType.defaultInitializer: String?
get() = withValidityAssertion {
when {