From f23aa21e0f30ef0a78ed0abe6298d2abf4edf6c5 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 8 Dec 2020 07:19:39 -0800 Subject: [PATCH] Support Shenandoah and ZGC Bazel currently refuses to start up when JVM is launched with `-XX:+UseShenandoahGC` or `-XX:+UseZGC`. This can be easily fixed by making `RetainedHeapLimiter` recognize the memory pool name `Shenandoah` and `ZHeap`. Closes #12644. PiperOrigin-RevId: 346318813 --- .../devtools/build/lib/runtime/RetainedHeapLimiter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java index b5997b3d360561..f8f49328fbc30c 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/RetainedHeapLimiter.java @@ -241,6 +241,8 @@ private static boolean isTenuredSpace(String name) { return "CMS Old Gen".equals(name) || "G1 Old Gen".equals(name) || "PS Old Gen".equals(name) - || "Tenured Gen".equals(name); + || "Tenured Gen".equals(name) + || "Shenandoah".equals(name) + || "ZHeap".equals(name); } }