From 36138f34ebef1871478ea0ace8706fe06433777b Mon Sep 17 00:00:00 2001
From: Alan Bateman <alan.bateman@oracle.com>
Date: Thu, 1 Jun 2023 07:33:20 +0100
Subject: [PATCH] Initial commit

---
 .../share/classes/java/lang/Thread.java          | 16 ----------------
 .../lang/Thread/DegradedMethodsThrowUOE.java     |  7 +++----
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 6d33247df3098..438c52391ec6f 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -2011,22 +2011,6 @@ public static int enumerate(Thread[] tarray) {
         return currentThread().getThreadGroup().enumerate(tarray);
     }
 
-    /**
-     * Throws {@code UnsupportedOperationException}.
-     *
-     * @return     nothing
-     *
-     * @deprecated This method was originally designed to count the number of
-     *             stack frames but the results were never well-defined and it
-     *             depended on thread-suspension.
-     *             This method is subject to removal in a future version of Java SE.
-     * @see        StackWalker
-     */
-    @Deprecated(since="1.2", forRemoval=true)
-    public int countStackFrames() {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Waits at most {@code millis} milliseconds for this thread to terminate.
      * A timeout of {@code 0} means to wait forever.
diff --git a/test/jdk/java/lang/Thread/DegradedMethodsThrowUOE.java b/test/jdk/java/lang/Thread/DegradedMethodsThrowUOE.java
index e3141b02fdd85..b16b70eaff079 100644
--- a/test/jdk/java/lang/Thread/DegradedMethodsThrowUOE.java
+++ b/test/jdk/java/lang/Thread/DegradedMethodsThrowUOE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug  8289610 8249627 8205132
- * @summary Test that Thread stop/suspend/resume/countStackFrames throw UOE
+ * @summary Test that Thread stop/suspend/resume throw UOE
  * @run junit DegradedMethodsThrowUOE
  */
 
@@ -45,8 +45,7 @@ static Stream<Consumer<Thread>> ops() {
         return Stream.<Consumer<Thread>>of(
                 Thread::stop,
                 Thread::suspend,
-                Thread::resume,
-                Thread::countStackFrames
+                Thread::resume
         );
     }