Fix parsing of SMAP for Kotlin 1.5 (#1164)

jacoco · Mar 16, 2021 · faa8b7a · faa8b7a
1 parent d9296f7
commit faa8b7a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/...jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinInlineFilterTest.java b/...jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinInlineFilterTest.java
@@ -163,6 +163,47 @@ public void should_filter_when_in_same_file() {
 		assertIgnored(expectedRanges.toArray(new Range[0]));
 	}
 
+	/**
+	 * See <a href="https://youtrack.jetbrains.com/issue/KT-37704">KT-37704</a>
+	 *
+	 * <pre>
+	 * inline fun f() {}
+	 * fun g() = f()
+	 * </pre>
+	 */
+	@Test
+	public void should_filter_without_parsing_KotlinDebug_stratum() {
+		context.sourceFileName = "Example.kt";
+		context.sourceDebugExtension = "" //
+				+ "SMAP\n" //
+				+ "Example.kt\n" // OutputFileName=Example.kt
+				+ "Kotlin\n" // DefaultStratumId=Kotlin
+				+ "*S Kotlin\n" // StratumID=Kotlin
+				+ "*F\n" // FileSection
+				+ "+ 1 Example.kt\n" // FileID=1,FileName=Example.kt
+				+ "ExampleKt\n" //
+				+ "*L\n" // LineSection
+				+ "1#1,3:1\n" // InputStartLine=1,LineFileID=1,RepeatCount=3,OutputStartLine=1
+				+ "1#1:4\n" // InputStartLine=1,LineFileID=1,OutputStartLine=4
+				+ "*S KotlinDebug\n"; // StratumID=KotlinDebug
+		context.classAnnotations
+				.add(KotlinGeneratedFilter.KOTLIN_METADATA_DESC);
+
+		m.visitLineNumber(2, new Label());
+		m.visitInsn(Opcodes.ICONST_0);
+		m.visitVarInsn(Opcodes.ISTORE, 0);
+		m.visitLineNumber(4, new Label());
+		shouldIgnorePrevious(m);
+		m.visitInsn(Opcodes.NOP);
+		shouldIgnorePrevious(m);
+		m.visitLineNumber(3, new Label());
+		m.visitInsn(Opcodes.RETURN);
+
+		filter.filter(m, context, output);
+
+		assertIgnored(expectedRanges.toArray(new Range[0]));
+	}
+
 	@Test
 	public void should_not_parse_SourceDebugExtension_attribute_when_no_kotlin_metadata_annotation() {
 		context.sourceDebugExtension = "SMAP";

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinInlineFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinInlineFilter.java
@@ -92,7 +92,11 @@ private static int getFirstGeneratedLineNumber(final String sourceFileName,
 			}
 			// LineSection
 			int min = Integer.MAX_VALUE;
-			while (!"*E".equals(line = br.readLine())) {
+			while (true) {
+				line = br.readLine();
+				if (line.equals("*E") || line.equals("*S KotlinDebug")) {
+					break;
+				}
 				final Matcher m = LINE_INFO_PATTERN.matcher(line);
 				if (!m.matches()) {
 					throw new IllegalStateException(

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -41,6 +41,12 @@ <h3>New Features</h3>
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1156">#1156</a>).</li>
 </ul>
 
+<h3>Fixed bugs</h3>
+<ul>
+  <li>Fixed parsing of SMAP generated by Kotlin compiler version 1.5.0 and above
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1164">#1164</a>).</li>
+</ul>
+
 <h3>Non-functional Changes</h3>
 <ul>
   <li>JaCoCo now depends on ASM 9.1
@@ -51,7 +57,6 @@ <h3>Non-functional Changes</h3>
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1121">#1121</a>).</li>
 </ul>
 
-
 <h2>Release 0.8.6 (2020/09/15)</h2>
 
 <h3>New Features</h3>