Increment metadata version and improve message for error type
Follow-up of 617bed1b
This commit is contained in:
+4
-1
@@ -25,6 +25,7 @@ class TypeDeserializer(
|
||||
private val parent: TypeDeserializer?,
|
||||
typeParameterProtos: List<ProtoBuf.TypeParameter>,
|
||||
private val debugName: String,
|
||||
private val containerPresentableName: String,
|
||||
var experimentalSuspendFunctionTypeEncountered: Boolean = false
|
||||
) {
|
||||
private val classDescriptors: (Int) -> ClassDescriptor? = c.storageManager.createMemoizedFunctionWithNullableValues { fqNameIndex ->
|
||||
@@ -112,7 +113,9 @@ class TypeDeserializer(
|
||||
proto.hasClassName() -> (classDescriptors(proto.className) ?: notFoundClass(proto.className)).typeConstructor
|
||||
proto.hasTypeParameter() ->
|
||||
typeParameterTypeConstructor(proto.typeParameter)
|
||||
?: ErrorUtils.createErrorTypeConstructor("Unknown type parameter ${proto.typeParameter}")
|
||||
?: ErrorUtils.createErrorTypeConstructor(
|
||||
"Unknown type parameter ${proto.typeParameter}. Please try recompiling module containing \"$containerPresentableName\""
|
||||
)
|
||||
proto.hasTypeParameterName() -> {
|
||||
val container = c.containingDeclaration
|
||||
val name = c.nameResolver.getString(proto.typeParameterName)
|
||||
|
||||
+2
-1
@@ -80,7 +80,8 @@ class DeserializationContext(
|
||||
) {
|
||||
val typeDeserializer: TypeDeserializer = TypeDeserializer(
|
||||
this, parentTypeDeserializer, typeParameters,
|
||||
"Deserializer for ${containingDeclaration.name}"
|
||||
"Deserializer for \"${containingDeclaration.name}\"",
|
||||
containerSource?.presentableString ?: "[container not found]"
|
||||
)
|
||||
|
||||
val memberDeserializer: MemberDeserializer = MemberDeserializer(this)
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ class JvmMetadataVersion(versionArray: IntArray, val isStrictSemantics: Boolean)
|
||||
|
||||
companion object {
|
||||
@JvmField
|
||||
val INSTANCE = JvmMetadataVersion(1, 1, 13)
|
||||
val INSTANCE = JvmMetadataVersion(1, 1, 14)
|
||||
|
||||
@JvmField
|
||||
val INVALID_VERSION = JvmMetadataVersion()
|
||||
|
||||
Reference in New Issue
Block a user