IR: restore reading common Klib from JVM

Adapt to changes in linker
This commit is contained in:
Georgy Bronnikov
2020-02-20 09:40:36 +03:00
parent d54a35ef56
commit fe009ac695
14 changed files with 179 additions and 170 deletions
@@ -603,6 +603,13 @@ abstract class KotlinIrLinker(
if (!signature.shouldBeDeserialized()) return null
val descriptor = symbol.descriptor
/*
Wrapped descriptors come from inside IrLinker. If a symbol with such a descriptor ends up here, this means we
have already looked for it in IrLinker and failed.
*/
if (descriptor is WrappedDeclarationDescriptor<*>) return null
if (descriptor is FunctionClassDescriptor || (descriptor.containingDeclaration is FunctionClassDescriptor)) {
return null
}