Upgrade to ASM5. Now using asm-debug-all as asm-all is broken and we get

better stack traces.

5 files changed, 13 insertions, 8 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/ContentTypeDetectorTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/ContentTypeDetectorTest.java
index be7722b4..6fc7b271 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/ContentTypeDetectorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/ContentTypeDetectorTest.java
@@ -101,6 +101,13 @@ public class ContentTypeDetectorTest {
 	}
 
 	@Test
+	public void testClassFile18() throws IOException {
+		initData(0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0x00, 0x00, 0x34);
+		assertEquals(ContentTypeDetector.CLASSFILE, detector.getType());
+		assertContent();
+	}
+
+	@Test
 	public void testMachObjectFile() throws IOException {
 		initData(0xCA, 0xFE, 0xBA, 0xBE, 0x00, 0x00, 0x00, 0x02);
 		assertEquals(ContentTypeDetector.UNKNOWN, detector.getType());
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/MethodAnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/MethodAnalyzerTest.java
index 8cfc732b..ed039c1b 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/MethodAnalyzerTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/MethodAnalyzerTest.java
@@ -257,7 +257,8 @@ public class MethodAnalyzerTest implements IProbeIdGenerator {
 		method.visitLabel(l1);
 		method.visitLineNumber(1001, l1);
 		method.visitVarInsn(Opcodes.ALOAD, 0);
-		method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "Foo", "test", "()Z");
+		method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "Foo", "test", "()Z",
+				false);
 		method.visitJumpInsn(Opcodes.IFEQ, l1);
 		final Label l2 = new Label();
 		method.visitLabel(l2);
@@ -512,7 +513,7 @@ public class MethodAnalyzerTest implements IProbeIdGenerator {
 		method.visitLineNumber(1001, l1);
 		method.visitVarInsn(Opcodes.ALOAD, 0);
 		method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Throwable",
-				"printStackTrace", "()V");
+				"printStackTrace", "()V", false);
 		method.visitLabel(l2);
 		method.visitJumpInsn(Opcodes.GOTO, l4);
 		method.visitLabel(l3);
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/LabelFlowAnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/LabelFlowAnalyzerTest.java
index 5c748e47..5d3ec36e 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/LabelFlowAnalyzerTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/LabelFlowAnalyzerTest.java
@@ -295,7 +295,7 @@ public class LabelFlowAnalyzerTest {
 
 	@Test
 	public void testMethodInsn() {
-		analyzer.visitMethodInsn(INVOKEVIRTUAL, "Foo", "doit", "()V");
+		analyzer.visitMethodInsn(INVOKEVIRTUAL, "Foo", "doit", "()V", false);
 		assertTrue(analyzer.successor);
 		assertFalse(analyzer.first);
 	}
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/MethodProbesAdapterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/MethodProbesAdapterTest.java
index 637bf5e3..ea329632 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/MethodProbesAdapterTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/MethodProbesAdapterTest.java
@@ -14,7 +14,6 @@ package org.jacoco.core.internal.flow;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
-import java.util.List;
 
 import org.jacoco.core.instr.MethodRecorder;
 import org.junit.After;
@@ -87,9 +86,7 @@ public class MethodProbesAdapterTest implements IProbeIdGenerator {
 		}
 
 		private void rec(String name, Object... args) {
-			@SuppressWarnings("unchecked")
-			final List<Object> text = printer.text;
-			text.add(name + Arrays.asList(args));
+			printer.text.add(name + Arrays.asList(args));
 		}
 
 	}
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
index be202491..aeb4ccc2 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/DuplicateFrameEliminatorTest.java
@@ -95,7 +95,7 @@ public class DuplicateFrameEliminatorTest {
 	@Test
 	public void testMethodInsn() {
 		testInstructionBetweenFrames(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
-				"Foo", "run", "()V"));
+				"Foo", "run", "()V", false));
 	}
 
 	@Test