diff options
| author | Evgeny Mandrikov <138671+Godin@users.noreply.github.com> | 2021-03-21 20:10:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 20:10:49 +0100 |
| commit | 5bbe20239ce1e1ed07d039fcf1e465934310d9a4 (patch) | |
| tree | c9848f21f8dd97f78cdae100d755d39a3cb46e67 /org.jacoco.core | |
| parent | faa8b7ad2ced6a3f2de8adcca8fd5a0626d64d91 (diff) | |
| download | jacoco-5bbe20239ce1e1ed07d039fcf1e465934310d9a4.tar.gz | |
Update KotlinLateinitFilter for Kotlin 1.5 (#1166)
Diffstat (limited to 'org.jacoco.core')
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilter.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilter.java index 4835f33e..a5e20265 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilter.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilter.java @@ -14,6 +14,7 @@ package org.jacoco.core.internal.analysis.filter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.JumpInsnNode; import org.objectweb.asm.tree.MethodNode; /** @@ -44,6 +45,13 @@ public class KotlinLateinitFilter implements IFilter { "throwUninitializedPropertyAccessException", "(Ljava/lang/String;)V"); + if (cursor != null + && skipNonOpcodes(cursor.getNext()) != skipNonOpcodes( + ((JumpInsnNode) start).label)) { + nextIs(Opcodes.ACONST_NULL); + nextIs(Opcodes.ATHROW); + } + if (cursor != null) { output.ignore(start, cursor); } |