Upgrade JaCoCo to 0.8.8 and ASM 9.4
+ ClassProbesMapper fix to initialize the className correctly
Related to #16412
Partial commit for third_party/*, see #17514.
Signed-off-by: kshyanashree <kshyanashreem@example.com>
diff --git a/third_party/BUILD b/third_party/BUILD
index 8a25fe9..b61ee36 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -99,35 +99,35 @@
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"],
)
diff --git a/third_party/asm/asm-9.2-sources.jar b/third_party/asm/asm-9.2-sources.jar
deleted file mode 100644
index b4fbd58..0000000
--- a/third_party/asm/asm-9.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-9.2.jar b/third_party/asm/asm-9.2.jar
deleted file mode 100644
index 3557ae4..0000000
--- a/third_party/asm/asm-9.2.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-9.4-sources.jar b/third_party/asm/asm-9.4-sources.jar
new file mode 100644
index 0000000..89dbb8d
--- /dev/null
+++ b/third_party/asm/asm-9.4-sources.jar
Binary files differ
diff --git a/third_party/asm/asm-9.4.jar b/third_party/asm/asm-9.4.jar
new file mode 100644
index 0000000..01cb52e
--- /dev/null
+++ b/third_party/asm/asm-9.4.jar
Binary files differ
diff --git a/third_party/asm/asm-analysis-9.2-sources.jar b/third_party/asm/asm-analysis-9.2-sources.jar
deleted file mode 100644
index 9d9f8de..0000000
--- a/third_party/asm/asm-analysis-9.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-analysis-9.2.jar b/third_party/asm/asm-analysis-9.2.jar
deleted file mode 100644
index 9d575ca..0000000
--- a/third_party/asm/asm-analysis-9.2.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-analysis-9.4-sources.jar b/third_party/asm/asm-analysis-9.4-sources.jar
new file mode 100644
index 0000000..3720b1f
--- /dev/null
+++ b/third_party/asm/asm-analysis-9.4-sources.jar
Binary files differ
diff --git a/third_party/asm/asm-analysis-9.4.jar b/third_party/asm/asm-analysis-9.4.jar
new file mode 100644
index 0000000..29f78f0
--- /dev/null
+++ b/third_party/asm/asm-analysis-9.4.jar
Binary files differ
diff --git a/third_party/asm/asm-commons-9.2-sources.jar b/third_party/asm/asm-commons-9.2-sources.jar
deleted file mode 100644
index 1d5ad05..0000000
--- a/third_party/asm/asm-commons-9.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-commons-9.2.jar b/third_party/asm/asm-commons-9.2.jar
deleted file mode 100644
index 01028a0..0000000
--- a/third_party/asm/asm-commons-9.2.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-commons-9.4-sources.jar b/third_party/asm/asm-commons-9.4-sources.jar
new file mode 100644
index 0000000..aa0687c
--- /dev/null
+++ b/third_party/asm/asm-commons-9.4-sources.jar
Binary files differ
diff --git a/third_party/asm/asm-commons-9.4.jar b/third_party/asm/asm-commons-9.4.jar
new file mode 100644
index 0000000..593621a
--- /dev/null
+++ b/third_party/asm/asm-commons-9.4.jar
Binary files differ
diff --git a/third_party/asm/asm-tree-9.2-sources.jar b/third_party/asm/asm-tree-9.2-sources.jar
deleted file mode 100644
index 2c89880..0000000
--- a/third_party/asm/asm-tree-9.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-tree-9.2.jar b/third_party/asm/asm-tree-9.2.jar
deleted file mode 100644
index 0a6833a..0000000
--- a/third_party/asm/asm-tree-9.2.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-tree-9.4-sources.jar b/third_party/asm/asm-tree-9.4-sources.jar
new file mode 100644
index 0000000..8d31cf0
--- /dev/null
+++ b/third_party/asm/asm-tree-9.4-sources.jar
Binary files differ
diff --git a/third_party/asm/asm-tree-9.4.jar b/third_party/asm/asm-tree-9.4.jar
new file mode 100644
index 0000000..c560305
--- /dev/null
+++ b/third_party/asm/asm-tree-9.4.jar
Binary files differ
diff --git a/third_party/asm/asm-util-9.2-sources.jar b/third_party/asm/asm-util-9.2-sources.jar
deleted file mode 100644
index 3b289ed..0000000
--- a/third_party/asm/asm-util-9.2-sources.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-util-9.2.jar b/third_party/asm/asm-util-9.2.jar
deleted file mode 100644
index 3afe6e6..0000000
--- a/third_party/asm/asm-util-9.2.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/asm/asm-util-9.4-sources.jar b/third_party/asm/asm-util-9.4-sources.jar
new file mode 100644
index 0000000..dac4ed7
--- /dev/null
+++ b/third_party/asm/asm-util-9.4-sources.jar
Binary files differ
diff --git a/third_party/asm/asm-util-9.4.jar b/third_party/asm/asm-util-9.4.jar
new file mode 100644
index 0000000..fbe1fcb
--- /dev/null
+++ b/third_party/asm/asm-util-9.4.jar
Binary files differ
diff --git a/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch b/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch
deleted file mode 100644
index 27cdc32..0000000
--- a/third_party/java/jacoco/0001-Disable-use-of-constant-dynamic-bytecode.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
-
diff --git a/third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch b/third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch
similarity index 92%
rename from third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch
rename to third_party/java/jacoco/0001-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch
index b10d780..a15c3dc 100644
--- a/third_party/java/jacoco/0002-Partially-revert-40c8fd89b0bc0c36e30e6a12f5b42d9da13.patch
+++ b/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 @@
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 @@
}
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 @@
.getProbes();
}
--
-2.32.0.93.g670b81a890-goog
+2.37.1 (Apple Git-137.1)
diff --git a/third_party/java/jacoco/BUILD b/third_party/java/jacoco/BUILD
index cea8831..9326d3d 100644
--- a/third_party/java/jacoco/BUILD
+++ b/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 @@
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 @@
["*-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",
],
)
diff --git a/third_party/java/jacoco/jacocoagent-0.8.8.jar b/third_party/java/jacoco/jacocoagent-0.8.8.jar
new file mode 100644
index 0000000..2208276
--- /dev/null
+++ b/third_party/java/jacoco/jacocoagent-0.8.8.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar
new file mode 100644
index 0000000..7787ee4
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.agent-0.8.8-sources.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar b/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar
new file mode 100644
index 0000000..d49ac27
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.agent-0.8.8.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar
new file mode 100644
index 0000000..766426d
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.ant-0.8.8-nodeps.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar
new file mode 100644
index 0000000..2976b05
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.ant-0.8.8-sources.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar b/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar
new file mode 100644
index 0000000..326f620
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.ant-0.8.8.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar
new file mode 100644
index 0000000..3fdadcd
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.core-0.8.8-sources.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.core-0.8.8.jar b/third_party/java/jacoco/org.jacoco.core-0.8.8.jar
new file mode 100644
index 0000000..97f0e69
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.core-0.8.8.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar b/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar
new file mode 100644
index 0000000..ff9acca
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.report-0.8.8-sources.jar
Binary files differ
diff --git a/third_party/java/jacoco/org.jacoco.report-0.8.8.jar b/third_party/java/jacoco/org.jacoco.report-0.8.8.jar
new file mode 100644
index 0000000..f347f92
--- /dev/null
+++ b/third_party/java/jacoco/org.jacoco.report-0.8.8.jar
Binary files differ
