diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java index 6d8ccc9965..b734d2344a 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java @@ -82,7 +82,7 @@ public void filter(final MethodNode methodNode, private static class Matcher extends AbstractMatcher { public void match(final MethodNode methodNode, final IFilterOutput output, final boolean constructor) { - cursor = methodNode.instructions.getFirst(); + cursor = skipNonOpcodes(methodNode.instructions.getFirst()); nextIs(Opcodes.IFNULL); nextIsType(Opcodes.NEW, "java/lang/UnsupportedOperationException"); @@ -102,7 +102,7 @@ public void match(final MethodNode methodNode, output.ignore(methodNode.instructions.getFirst(), cursor); next(); } else { - cursor = methodNode.instructions.getFirst(); + cursor = skipNonOpcodes(methodNode.instructions.getFirst()); } final Set ignore = new HashSet(); diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html index 58be8389dd..2eacdeb4b0 100644 --- a/org.jacoco.doc/docroot/doc/changes.html +++ b/org.jacoco.doc/docroot/doc/changes.html @@ -33,6 +33,9 @@

New Features

  • Branches added by the Kotlin compiler version 1.4.20 and above for suspending lambdas are filtered out during generation of report (GitHub #1149).
  • +
  • Branches added by the Kotlin compiler version 1.5.0 and above for functions + with default arguments are filtered out during generation of report + (GitHub #1162).
  • Improved filtering of bytecode generated by Kotlin compiler for when expressions on kotlin.String values (GitHub #1156).