Update KotlinDefaultArgumentsFilter for Kotlin 1.5 (#1162)

jacoco · Mar 15, 2021 · d9296f7 · d9296f7
1 parent 66b5fa9
commit d9296f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...acoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java b/...acoco.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<AbstractInsnNode> ignore = new HashSet<AbstractInsnNode>();

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -33,6 +33,9 @@ <h3>New Features</h3>
   <li>Branches added by the Kotlin compiler version 1.4.20 and above for suspending
       lambdas are filtered out during generation of report
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1149">#1149</a>).</li>
+  <li>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 <a href="https://github.com/jacoco/jacoco/issues/1162">#1162</a>).</li>
   <li>Improved filtering of bytecode generated by Kotlin compiler for
       <code>when</code> expressions on <code>kotlin.String</code> values
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1156">#1156</a>).</li>