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

Properly process the absence of protobuf field.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-04-27 17:32:17 +03:00
committed by alexander-gorshenev
parent 67867dd6fb
commit cbce4cf994
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/LocalDeclarationDeserializer.kt
+5 -4
View File
@@ -98,11 +98,12 @@ class LocalDeclarationDeserializer(val rootDescriptor: DeserializedCallableMembe
} }
private fun memberDeserializer(irProto: KonanIr.KotlinDescriptor): MemberDeserializer { private fun memberDeserializer(irProto: KonanIr.KotlinDescriptor): MemberDeserializer {
val containingFqName = irProto.classOrPackage return if (irProto.hasClassOrPackage()) {
return if (containingFqName != null) { memberDeserializerByParentFqNameIndex(irProto.classOrPackage)
memberDeserializerByParentFqNameIndex(containingFqName) } else {
// TODO: learn to take the containing IR declaration // TODO: learn to take the containing IR declaration
} else this.memberDeserializer this.memberDeserializer
}
} }
fun deserializeFunction(irProto: KonanIr.KotlinDescriptor): FunctionDescriptor = fun deserializeFunction(irProto: KonanIr.KotlinDescriptor): FunctionDescriptor =