From 929b6dd92f1ced4ecec40ecfafddd02a982a0ef2 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Fri, 19 Feb 2021 16:04:45 +0100 Subject: [PATCH] Do not swallow PCE #KT-39776 Fixed (cherry picked from commit b8d1bbdd0d7c894165e07dcca2520c14872fcb5a) --- .../jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt index 1e484346619d7..0e5b950f0dedf 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.load.kotlin import com.intellij.ide.highlighter.JavaClassFileType +import com.intellij.openapi.diagnostic.ControlFlowException import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder.Result.KotlinClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader @@ -73,9 +73,10 @@ class VirtualFileKotlinClass private constructor( } } catch (e: FileNotFoundException) { // Valid situation. User can delete jar file. - } catch (e: ProcessCanceledException) { - // Valid situation. } catch (e: Throwable) { + if (e is ControlFlowException) { + throw e + } LOG.warn(renderFileReadingErrorMessage(file), e) } null