diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt index b8337f4c154..e0d55bff5e5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt @@ -306,6 +306,7 @@ class FastMethodAnalyzer( val begin = tcb.start.indexOf() val end = tcb.end.indexOf() for (j in begin until end) { + if (!insnsArray[j].isMeaningful) continue var insnHandlers: MutableList? = handlers[j] if (insnHandlers == null) { insnHandlers = SmartList() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/InstructionLivenessAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/InstructionLivenessAnalyzer.kt index a6ee806475a..79ce19d16d1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/InstructionLivenessAnalyzer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/InstructionLivenessAnalyzer.kt @@ -126,9 +126,10 @@ class InstructionLivenessAnalyzer(val method: MethodNode) { val begin = tcb.start.indexOf val end = tcb.end.indexOf for (j in begin until end) { + if (!instructions[j].isMeaningful) continue var insnHandlers = handlers[j] if (insnHandlers == null) { - insnHandlers = ArrayList() + insnHandlers = ArrayList() handlers[j] = insnHandlers } insnHandlers.add(tcb)