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

Parcelable: Use java/lang/Enum methods to read/write enum values (KT-20022)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-09-01 23:13:45 +03:00
committed by Yan Zhulanow
parent 7b96c9a003
commit 88138fc420
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializers.kt
+5 -2
View File
@@ -418,13 +418,16 @@ internal class ObjectParcelSerializer(
internal class EnumParcelSerializer(override val asmType: Type) : ParcelSerializer { internal class EnumParcelSerializer(override val asmType: Type) : ParcelSerializer {
override fun writeValue(v: InstructionAdapter) { override fun writeValue(v: InstructionAdapter) {
v.invokevirtual(asmType.internalName, "name", "()Ljava/lang/String;", false) v.invokevirtual("java/lang/Enum", "name", "()Ljava/lang/String;", false)
v.invokevirtual(PARCEL_TYPE.internalName, "writeString", "(Ljava/lang/String;)V", false) v.invokevirtual(PARCEL_TYPE.internalName, "writeString", "(Ljava/lang/String;)V", false)
} }
override fun readValue(v: InstructionAdapter) { override fun readValue(v: InstructionAdapter) {
v.invokevirtual(PARCEL_TYPE.internalName, "readString", "()Ljava/lang/String;", false) v.invokevirtual(PARCEL_TYPE.internalName, "readString", "()Ljava/lang/String;", false)
v.invokestatic(asmType.internalName, "valueOf", "(Ljava/lang/String;)${asmType.descriptor}", false) v.aconst(asmType)
v.swap()
v.invokestatic("java/lang/Enum", "valueOf", "(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;", false)
v.castIfNeeded(asmType)
} }
} }