From de6731cb4bdd52bea4b066efca124062416a4ffc Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Thu, 12 Nov 2015 14:35:33 +0300 Subject: [PATCH] Additional diagnostic for KT-9980: KotlinFrontEndException: Exception while analyzing expression --- .../kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt index 7d1e800af97..90d92d2678f 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.descriptors.PackagePartProvider import org.jetbrains.kotlin.load.kotlin.ModuleMapping +import java.io.EOFException public class JvmPackagePartProvider(val env: KotlinCoreEnvironment) : PackagePartProvider { @@ -47,7 +48,11 @@ public class JvmPackagePartProvider(val env: KotlinCoreEnvironment) : PackagePar }.filterNotNull().flatMap { it.children.filter { it.name.endsWith(ModuleMapping.MAPPING_FILE_EXT) }.toList() }.map { - ModuleMapping.create(it.contentsToByteArray()) + try { + ModuleMapping.create(it.contentsToByteArray()) + } catch (e: EOFException) { + throw RuntimeException("Error on reading package parts for '$packageFqName' package in '$it', roots: $roots", e) + } } return mappings.map { it.findPackageParts(packageFqName) }.filterNotNull().flatMap { it.parts }.distinct()