0001-Disable-use-of-constant-dynamic-bytecode.patch

From 2421d449639b7cf1d848af65739c564d9379200e Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Thu, 28 Jan 2021 21:25:28 -0800
Subject: [PATCH 1/2] Disable use of 'constant dynamic' bytecode

Ssee b/177688213 and https://github.com/jacoco/jacoco/issues/1151
---
 .../instr/ProbeArrayStrategyFactory.java         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java
index fb4efa11..582052e7 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java
@@ -51,10 +51,10 @@ public final class ProbeArrayStrategyFactory {
 			if (counter.getCount() == 0) {
 				return new NoneProbeArrayStrategy();
 			}
-			if (version >= Opcodes.V11 && counter.hasMethods()) {
-				return new CondyProbeArrayStrategy(className, true, classId,
-						accessorGenerator);
-			}
+			// if (version >= Opcodes.V11 && counter.hasMethods()) {
+			// return new CondyProbeArrayStrategy(className, true, classId,
+			// accessorGenerator);
+			// }
 			if (version >= Opcodes.V1_8 && counter.hasMethods()) {
 				return new InterfaceFieldProbeArrayStrategy(className, classId,
 						counter.getCount(), accessorGenerator);
@@ -63,10 +63,10 @@ public final class ProbeArrayStrategyFactory {
 						counter.getCount(), accessorGenerator);
 			}
 		} else {
-			if (version >= Opcodes.V11) {
-				return new CondyProbeArrayStrategy(className, false, classId,
-						accessorGenerator);
-			}
+			// if (version >= Opcodes.V11) {
+			// return new CondyProbeArrayStrategy(className, false, classId,
+			// accessorGenerator);
+			// }
 			return new ClassFieldProbeArrayStrategy(className, classId,
 					InstrSupport.needsFrames(version), accessorGenerator);
 		}
-- 
2.32.0.93.g670b81a890-goog