From 372a4e466e46e8085c9936363063e15caf6adff2 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@redhat.com>
Date: Fri, 19 Nov 2021 15:43:39 -0500
Subject: [PATCH] Backport 9376dd810ce129c1786cce6ab7691f7154902452

---
 .../jtreg/serviceability/sa/ClhsdbCDSCore.java       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
index 3e7c3a0b0ee..33d25f9a38a 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
@@ -54,6 +54,7 @@
 import java.util.regex.Matcher;
 import jdk.internal.misc.Unsafe;
 import java.util.Scanner;
+import jdk.test.lib.Utils;
 import jtreg.SkippedException;
 
 class CrashApp {
@@ -164,7 +165,16 @@ public static void main(String[] args) throws Exception {
                 throw new SkippedException("The CDS archive is not mapped");
             }
 
-            cmds = List.of("printmdo -a", "printall", "jstack -v");
+            List testJavaOpts = Arrays.asList(Utils.getTestJavaOpts());
+
+            if (testJavaOpts.contains("-Xcomp") && testJavaOpts.contains("-XX:TieredStopAtLevel=1")) {
+                // No MDOs are allocated in -XX:TieredStopAtLevel=1 + -Xcomp mode
+                // The reason is methods being compiled aren't hot enough
+                // Let's not call printmdo in such scenario
+                cmds = List.of("printall", "jstack -v");
+            } else {
+                cmds = List.of("printmdo -a", "printall", "jstack -v");
+            }
 
             Map<String, List<String>> expStrMap = new HashMap<>();
             Map<String, List<String>> unExpStrMap = new HashMap<>();