Merge pull request #18145 from keithc-ca/stackwalker

StackWalker updates for Java 22
eclipse-openj9 · Sep 15, 2023 · 910fbb3 · 910fbb3
2 parents 58cf232 + 0ce6e76
commit 910fbb3
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 131 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java b/jcl/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java
@@ -26,26 +26,20 @@
 import java.lang.StackWalker.StackFrame;
 import java.lang.StackWalker.StackFrameImpl;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
-import static java.lang.StackWalker.Option.*;
 
 /**
- * Prints the stack trace of Pinned Thread that is attempting to yield.
+ * Prints the stack trace of a pinned thread that is attempting to yield.
  */
 final class PinnedThreadPrinter {
-	private static final StackWalker STACKWALKER;
 
-	static {
-		STACKWALKER = StackWalker.getInstance(Set.of(SHOW_REFLECT_FRAMES, RETAIN_CLASS_REFERENCE));
-		STACKWALKER.setGetMonitorsFlag();
-	}
+	private static final StackWalker STACKWALKER = StackWalker.newInstanceWithMonitors();
 
 	static void printStackTrace(PrintStream out, boolean printAll) {
 		out.println(Thread.currentThread());
 		List<StackFrame> stackFrames = STACKWALKER.walk(s -> s.collect(Collectors.toList()));
 		for (int i = 0; i < stackFrames.size(); i++) {
-			StackFrameImpl sti = (StackFrameImpl)stackFrames.get(i);
+			StackFrameImpl sti = (StackFrameImpl) stackFrames.get(i);
 			Object[] monitors = sti.getMonitors();
 
 			if (monitors != null) {