module-info.class should be excluded from analysis (bazelbuild#859)

gergelyfabian · Mar 16, 2019 · 1db0792 · 1db0792
1 parent 795c8f9
commit 1db0792
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java
@@ -76,6 +76,20 @@ public void setup() {
 		analyzer = new Analyzer(executionData, new EmptyStructureVisitor());
 	}
 
+	@Test
+	public void should_ignore_module_info() throws Exception {
+		final ClassWriter cw = new ClassWriter(0);
+		cw.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null,
+				null);
+		cw.visitModule("module", 0, null).visitEnd();
+		cw.visitEnd();
+		final byte[] bytes = cw.toByteArray();
+
+		analyzer.analyzeClass(bytes, "");
+
+		assertTrue(classes.isEmpty());
+	}
+
 	@Test
 	public void should_ignore_synthetic_classes() throws Exception {
 		final ClassWriter cw = new ClassWriter(0);

diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java b/org.jacoco.core/src/org/jacoco/core/analysis/Analyzer.java
@@ -104,6 +104,9 @@ public void visitEnd() {
 	private void analyzeClass(final byte[] source) {
 		final long classId = CRC64.classId(source);
 		final ClassReader reader = InstrSupport.classReaderFor(source);
+		if ((reader.getAccess() & Opcodes.ACC_MODULE) != 0) {
+			return;
+		}
 		if ((reader.getAccess() & Opcodes.ACC_SYNTHETIC) != 0) {
 			return;
 		}

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -35,6 +35,10 @@ <h3>Fixed bugs</h3>
   <li>Fixed incorrect update of frames caused by bug in ASM library in case of
       arrays with more than 7 dimensions
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/839">#839</a>).</li>
+  <li>Fixed regression, which was introduced in 0.8.3 -
+      <code>module-info.class</code> should be excluded from analysis to not cause
+      <code>IllegalStateException</code>
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/859">#859</a>).</li>
 </ul>
 
 <h3>API Changes</h3>