Upgrade JaCoCo to 0.8.8 and ASM 9.4

+ ClassProbesMapper fix to initialize the className correctly

Related to bazelbuild#16412

src/java_tools/junitrunner/java/com/google/testing/coverage/ClassProbesMapper.java

@@ -52,7 +52,7 @@ public Map<Integer, BranchExp> result() {
   public ClassProbesMapper(String className) {
     classLineToBranchExp = new TreeMap<Integer, BranchExp>();
     stringPool = new StringPool();
-    className = stringPool.get(className);
+    this.className = stringPool.get(className);
   }
 
   @Override

third_party/BUILD

@@ -165,35 +165,35 @@ java_library(
 distrib_java_import(
     name = "asm",
     enable_distributions = ["debian"],
-    jars = ["asm/asm-9.2.jar"],
-    srcjar = "asm/asm-9.2-sources.jar",
+    jars = ["asm/asm-9.4.jar"],
+    srcjar = "asm/asm-9.4-sources.jar",
 )
 
 java_import(
     name = "asm-analysis",
-    jars = ["asm/asm-analysis-9.2.jar"],
-    srcjar = "asm/asm-analysis-9.2-sources.jar",
+    jars = ["asm/asm-analysis-9.4.jar"],
+    srcjar = "asm/asm-analysis-9.4-sources.jar",
     runtime_deps = [":asm-tree"],
 )
 
 java_import(
     name = "asm-commons",
-    jars = ["asm/asm-commons-9.2.jar"],
-    srcjar = "asm/asm-commons-9.2-sources.jar",
+    jars = ["asm/asm-commons-9.4.jar"],
+    srcjar = "asm/asm-commons-9.4-sources.jar",
     runtime_deps = [":asm-tree"],
 )
 
 java_import(
     name = "asm-tree",
-    jars = ["asm/asm-tree-9.2.jar"],
-    srcjar = "asm/asm-tree-9.2-sources.jar",
+    jars = ["asm/asm-tree-9.4.jar"],
+    srcjar = "asm/asm-tree-9.4-sources.jar",
     runtime_deps = [":asm"],
 )
 
 java_import(
     name = "asm-util",
-    jars = ["asm/asm-util-9.2.jar"],
-    srcjar = "asm/asm-util-9.2-sources.jar",
+    jars = ["asm/asm-util-9.4.jar"],
+    srcjar = "asm/asm-util-9.4-sources.jar",
     runtime_deps = [":asm-tree"],
 )
 

third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch → third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch

@@ -1,7 +1,7 @@
-From d49447aae32e1794dfc5d5e31c848d57e27d17a7 Mon Sep 17 00:00:00 2001
+From c3d5e0ff638caf0038ce46054b906d51d59623e6 Mon Sep 17 00:00:00 2001
 From: Liam Miller-Cushon <cushon@google.com>
 Date: Thu, 28 Jan 2021 22:18:36 -0800
-Subject: [PATCH 2/2] Partially revert 40c8fd89b0bc0c36e30e6a12f5b42d9da13aca86
+Subject: [PATCH] Partially revert 40c8fd89b0bc0c36e30e6a12f5b42d9da13aca86
 
 See b/177687001#comment5.
 ---
@@ -10,7 +10,7 @@ See b/177687001#comment5.
  2 files changed, 11 insertions(+), 22 deletions(-)
 
 diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
-index efb74846..bba5dd1d 100644
+index 1f1696ff..cc5d37db 100644
 --- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
 +++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
 @@ -44,11 +44,8 @@ public class Agent implements IAgent {
@@ -46,7 +46,7 @@ index efb74846..bba5dd1d 100644
  	}
 
 diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
-index 476c4e2b..70bb4e8a 100644
+index 60c56686..c425f7a1 100644
 --- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
 +++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
 @@ -23,25 +23,17 @@ import org.jacoco.core.runtime.RuntimeData;
@@ -92,5 +92,5 @@ index 476c4e2b..70bb4e8a 100644
  				.getProbes();
  	}
 -- 
-2.32.0.93.g670b81a890-goog
+2.37.1 (Apple Git-137.1)
 

third_party/java/jacoco/BUILD

@@ -1,7 +1,7 @@
 # Description:
 #   JaCoCo is a free code coverage library for Java, created by the EclEmma team.
 #
-# https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.7/jacoco-0.8.7.zip
+# https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.8/jacoco-0.8.8.zip
 
 load("//tools/distributions:distribution_rules.bzl", "distrib_jar_filegroup", "distrib_java_import")
 load("//src:release_archive.bzl", "release_archive")
@@ -12,9 +12,9 @@ exports_files(["LICENSE"])
 
 package(default_visibility = ["//visibility:public"])
 
-LASTVERSION = "0.8.7"
+LASTVERSION = "0.8.8"
 
-VERSIONS = ("0.8.7",)
+VERSIONS = ("0.8.7", "0.8.8")
 
 filegroup(
     name = "srcs",
@@ -38,9 +38,9 @@ filegroup(
         ["*-sources.jar"],
         allow_empty = True,
     ) + ["LICENSE"] + [
-        "//third_party:asm/asm-9.2-sources.jar",
-        "//third_party:asm/asm-analysis-9.2-sources.jar",
-        "//third_party:asm/asm-commons-9.2-sources.jar",
+        "//third_party:asm/asm-9.4-sources.jar",
+        "//third_party:asm/asm-analysis-9.4-sources.jar",
+        "//third_party:asm/asm-commons-9.4-sources.jar",
     ],
 )