[GR-69848] [GR-69914] Fixes for native-image on espresso.

PullRequest: graal/22220

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso.launcher/src/com/oracle/truffle/espresso/launcher/EspressoLauncher.java

@@ -535,7 +535,8 @@ private void parseArgFile(String pathArg, List<String> expanded) {
                     "MaxRAMPercentage",
                     "UseParallelGC",
                     "GCTimeRatio",
-                    "ExitOnOutOfMemoryError");
+                    "ExitOnOutOfMemoryError",
+                    "UseCompressedOops");
 
     private static final Set<String> ignoredXXOptions = Set.of(
                     "UseJVMCICompiler",

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/DeadlockWatchdog.java

@@ -29,6 +29,7 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MonitorInfo;
 import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
@@ -132,7 +133,10 @@ public void setEnabled(boolean enable) {
     }
 
     private static void threadDump() {
-        for (ThreadInfo ti : ManagementFactory.getThreadMXBean().dumpAllThreads(true, true)) {
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        boolean lockedMonitors = threadMXBean.isObjectMonitorUsageSupported();
+        boolean lockedSynchronizers = threadMXBean.isSynchronizerUsageSupported();
+        for (ThreadInfo ti : threadMXBean.dumpAllThreads(lockedMonitors, lockedSynchronizers)) {
             printThreadInfo(ti);
             printLockInfo(ti.getLockedSynchronizers());
         }