No need to modify class bytes for Java 10 support (#740)

3 files changed, 0 insertions, 10 deletions

diff --git a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FinallyTest.java b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FinallyTest.java
index 82fb08cc..3987ecaa 100644
--- a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FinallyTest.java
+++ b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FinallyTest.java
@@ -21,7 +21,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.jacoco.core.internal.BytecodeVersion;
 import org.jacoco.core.test.TargetLoader;
 import org.jacoco.core.test.validation.Source.Line;
 import org.jacoco.core.test.validation.ValidationTestBase;
@@ -194,7 +193,6 @@ public class FinallyTest extends ValidationTestBase {
 		final Set<String> gotoTags = new HashSet<String>();
 
 		byte[] b = TargetLoader.getClassDataAsBytes(FinallyTarget.class);
-		b = BytecodeVersion.downgradeIfNeeded(BytecodeVersion.get(b), b);
 
 		final ClassNode classNode = new ClassNode();
 		new ClassReader(b).accept(classNode, 0);
diff --git a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FramesTest.java b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FramesTest.java
index 2d502c31..a8bd1bca 100644
--- a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FramesTest.java
+++ b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/FramesTest.java
@@ -18,7 +18,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import org.jacoco.core.instr.Instrumenter;
-import org.jacoco.core.internal.BytecodeVersion;
 import org.jacoco.core.internal.instr.InstrSupport;
 import org.jacoco.core.runtime.IRuntime;
 import org.jacoco.core.runtime.SystemPropertiesRuntime;
@@ -87,9 +86,6 @@ public class FramesTest {
 	}
 
 	private byte[] calculateFrames(byte[] source) {
-		source = BytecodeVersion.downgradeIfNeeded(BytecodeVersion.get(source),
-				source);
-
 		ClassReader rc = new ClassReader(source);
 		ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
 
diff --git a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/StructuredLockingTest.java b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/StructuredLockingTest.java
index 8243c4bc..1d197bf9 100644
--- a/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/StructuredLockingTest.java
+++ b/org.jacoco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/StructuredLockingTest.java
@@ -20,7 +20,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.jacoco.core.instr.Instrumenter;
-import org.jacoco.core.internal.BytecodeVersion;
 import org.jacoco.core.runtime.IRuntime;
 import org.jacoco.core.runtime.SystemPropertiesRuntime;
 import org.jacoco.core.test.TargetLoader;
@@ -65,9 +64,6 @@ public class StructuredLockingTest {
 		Instrumenter instrumenter = new Instrumenter(runtime);
 		byte[] instrumented = instrumenter.instrument(source, "TestTarget");
 
-		final int version = BytecodeVersion.get(instrumented);
-		instrumented = BytecodeVersion.downgradeIfNeeded(version, instrumented);
-
 		ClassNode cn = new ClassNode();
 		new ClassReader(instrumented).accept(cn, 0);
 		for (MethodNode mn : cn.methods) {