Serialization: Serializable meta annotation #4583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rsinukov
force-pushed
the
rsinukov/serializable-meta-annotation
branch
4 times, most recently
from
a517697 to
af0b58b
Compare
rsinukov
force-pushed
the
rsinukov/serializable-meta-annotation
branch
from
f8a7d94 to
5eefc3a
Compare
rsinukov
force-pushed
the
rsinukov/serializable-meta-annotation
branch
2 times, most recently
from
654ff1f to
f4a378b
Compare
sandwwraith
reviewed
Jan 20, 2022
| @@ -597,7 +604,9 @@ interface IrBuilderExtension { | |||
| irProperty.backingField?.symbol ?: error("Property expected to have backing field"), | |||
| property.type.toIrType(), | |||
| receiver | |||
| ) | |||
| ).let { | |||
| if (property.type.toIrType().isKClass()) kClassExprToJClassIfNeeded(startOffset, endOffset, it) else it | |||
There was a problem hiding this comment.
property.type.toIrType() is not very cheap operation, so IMO it's better to extract it to a separate variable beforehand
| } | ||
|
|
||
| private val IrClass.isInternalSerializable: Boolean get() = kind == ClassKind.CLASS && hasSerializableAnnotationWithoutArgs() | ||
| private val IrClass.isInternalSerializable: Boolean get() = this.descriptor.isInternalSerializable |
There was a problem hiding this comment.
In general, it's better to avoid using descriptors in IR transformations because it's considered deprecated and dangerous API, which can sometimes lead to 'unbound symbol' bugs. I think it's possible to modify IrClass.hasSerializableAnnotationWithoutArgs(): Boolean function so it would take into account meta-annotations, right?
| @@ -38,6 +38,8 @@ object SerializationAnnotations { | |||
| internal val contextualOnPropertyFqName = FqName("kotlinx.serialization.Contextual") | |||
| internal val polymorphicFqName = FqName("kotlinx.serialization.Polymorphic") | |||
| internal val additionalSerializersFqName = FqName("kotlinx.serialization.UseSerializers") | |||
|
|
|||
| internal val metaSerializableAnnotationFqName = FqName("kotlinx.serialization.MetaSerializable") | |||
There was a problem hiding this comment.
IMO better move it next to SerialInfo & InheritableSerialInfo
plugins/kotlin-serialization/kotlin-serialization-compiler/testData/boxIr/metaSerializable.kt
Show resolved
Hide resolved
plugins/kotlin-serialization/kotlin-serialization-compiler/testData/boxIr/metaSerializable.kt
Show resolved
Hide resolved
rsinukov
force-pushed
the
rsinukov/serializable-meta-annotation
branch
from
f4a378b to
2d54606
Compare
sandwwraith
approved these changes
Mar 25, 2022
| val annot = getAnnotation(SerializationAnnotations.serializableAnnotationFqName) | ||
| if (annot != null) { | ||
| for (i in 0 until annot.valueArgumentsCount) { | ||
| if (annot.getValueArgument(i) != null) return false |
There was a problem hiding this comment.
serializable annotation always have one argument so I think we may skip a loop here
sandwwraith
pushed a commit
that referenced
this pull request
Mar 27, 2022
This test is a leftover from the original implementation of #4583 which was updated. This test is redundant now.
maxim092001
pushed a commit
to maxim092001/kotlin
that referenced
this pull request
Apr 16, 2022
maxim092001
pushed a commit
to maxim092001/kotlin
that referenced
this pull request
Apr 16, 2022
This test is a leftover from the original implementation of JetBrains#4583 which was updated. This test is redundant now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://youtrack.jetbrains.com/issue/KTOR-2704
Add handling for (not yet released) kotlinx.serialization
@MetaSerializable