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

FIR JVM: correct signature conversion for array

Browse Source 
#KT-43339 Fixed
This commit is contained in:
Jinseong Jeon
2020-11-17 05:11:32 -08:00
committed by teamcityserver
parent 77ce5ea15d
commit 9a99af53ba
6 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt
+21 -12
View File
@@ -50,6 +50,7 @@ private fun StringBuilder.appendErasedType(typeRef: FirTypeRef) {
klass.fqName?.let {
append("L")
append(it.asString().replace(".", "/"))
append(";")
}
}
@@ -63,14 +64,13 @@ private fun StringBuilder.appendErasedType(typeRef: FirTypeRef) {
is JavaTypeParameter -> {
val representative = classifier.upperBounds.firstOrNull { it.classifier is JavaClass }
if (representative == null) {
append("Ljava/lang/Object")
append("Ljava/lang/Object;")
} else {
appendClass(representative.classifier as JavaClass)
}
}
else -> return
}
append(";")
}
}
}
@@ -92,19 +92,31 @@ private fun StringBuilder.appendConeType(coneType: ConeKotlinType) {
(coneType as? ConeClassLikeType)?.let {
val classId = it.lookupTag.classId
if (classId.packageFqName.toString() == "kotlin") {
PRIMITIVE_TYPE_SIGNATURE[classId.shortClassName.identifier]?.let {
append(it)
PRIMITIVE_TYPE_SIGNATURE[classId.shortClassName.identifier]?.let { signature ->
append(signature)
return
}
}
}
fun appendClassLikeType(type: ConeClassLikeType) {
append("L")
val classId = type.lookupTag.classId
append(classId.packageFqName.asString().replace(".", "/"))
append("/")
append(classId.relativeClassName)
if (classId.shortClassName.isSpecial) return
if (classId.shortClassName.identifier == "Array") {
append("[")
type.typeArguments.forEach { typeArg ->
when (typeArg) {
ConeStarProjection -> append("*")
is ConeKotlinTypeProjection -> appendConeType(typeArg.type)
}
}
} else {
append("L")
append(classId.packageFqName.asString().replace(".", "/"))
append("/")
append(classId.relativeClassName)
append(";")
}
}
if (coneType is ConeClassErrorType) return
@@ -117,21 +129,18 @@ private fun StringBuilder.appendConeType(coneType: ConeKotlinType) {
it.coneType is ConeClassLikeType
}
if (representative == null || representative is FirImplicitNullableAnyTypeRef || representative is FirImplicitAnyTypeRef) {
append("Ljava/lang/Object")
append("Ljava/lang/Object;")
} else {
appendClassLikeType(representative.coneTypeUnsafe())
}
}
is ConeDefinitelyNotNullType -> {
appendConeType(coneType.original)
return
}
is ConeFlexibleType -> {
appendConeType(coneType.lowerBound)
return
}
}
append(";")
}
private val unitClassId = ClassId.topLevel(FqName("kotlin.Unit"))
compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.fir.kt
Vendored
+6 -5
View File
@@ -1,11 +1,12 @@
// !LANGUAGE: -ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
// FULL_JDK
fun foo() {
try {
TODO()
} catch (_: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
try {
TODO()
@@ -27,7 +28,7 @@ fun foo() {
}
}
} catch (_: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
val y1 = _
val y2 = (`_`)
}
@@ -37,21 +38,21 @@ fun foo() {
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
val boo1 = { `_`: Exception ->
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
val boo2 = { _: Exception ->
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
}
compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlock.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// !LANGUAGE: -ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
// FULL_JDK
fun foo() {
try {
compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.fir.kt
Vendored
+6 -5
View File
@@ -1,11 +1,12 @@
// !LANGUAGE: +ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
// FULL_JDK
fun foo() {
try {
TODO()
} catch (_: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
try {
TODO()
@@ -27,7 +28,7 @@ fun foo() {
}
}
} catch (_: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
val y1 = _
val y2 = (`_`)
}
@@ -37,21 +38,21 @@ fun foo() {
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
val boo1 = { `_`: Exception ->
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
val boo2 = { _: Exception ->
try {
TODO()
} catch (x: Exception) {
`_`.<!UNRESOLVED_REFERENCE!>stackTrace<!>
`_`.stackTrace
}
}
}
compiler/testData/diagnostics/tests/resolve/underscoreInCatchBlockWithEnabledFeature.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// !LANGUAGE: +ForbidReferencingToUnderscoreNamedParameterOfCatchBlock
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_EXPRESSION
// FULL_JDK
fun foo() {
try {
compiler/testData/ir/irText/firProblems/throwableStackTrace.fir.txt
Vendored
+4 -1
View File
@@ -2,4 +2,7 @@ FILE fqName:<root> fileName:/throwableStackTrace.kt
FUN name:foo visibility:public modality:FINAL <> (t:kotlin.Throwable) returnType:kotlin.Unit
VALUE_PARAMETER name:t index:0 type:kotlin.Throwable
BLOCK_BODY
ERROR_CALL 'Unresolved reference: R|kotlin/stackTrace|' type=IrErrorType
CALL 'public open fun setStackTrace (p0: kotlin.Array<out java.lang.StackTraceElement?>?): kotlin.Unit declared in java.lang.Throwable' type=kotlin.Unit origin=EQ
$this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null
p0: CALL 'public open fun getStackTrace (): kotlin.Array<out java.lang.StackTraceElement?>? declared in java.lang.Throwable' type=kotlin.Array<out java.lang.StackTraceElement?>? origin=GET_PROPERTY
$this: GET_VAR 't: kotlin.Throwable declared in <root>.foo' type=kotlin.Throwable origin=null