Use static field in the debuggee to look up ThreadReference.

plummercj · plummercj · commit df79cbe65c97 · 2025-04-28T11:25:41.000-07:00
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
@@ -291,7 +291,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
@@ -283,8 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
-
+                  thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
                                      (thread1, StepRequest.STEP_MIN, StepRequest.STEP_INTO);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
@@ -283,7 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
@@ -285,7 +285,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
@@ -118,7 +118,7 @@ private static void execTest() {
             switch (i) {
 
                 case 0:
-                       ThreadReference thread = debuggee.threadByNameOrThrow(methodName);
+                       ThreadReference thread = debuggee.mainThread();
 
                        display(".....setting up StepRequest");
                        eventRequest = eventRequestManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
@@ -284,7 +284,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
@@ -282,7 +282,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
@@ -286,7 +286,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
@@ -291,7 +291,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
@@ -287,7 +287,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
@@ -275,7 +275,7 @@ private void testRun()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-            thread = debuggee.threadByNameOrThrow(threadName);
+            thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
 
             if (StepRequest.STEP_MIN > StepRequest.STEP_LINE) {
                 maxSize = StepRequest.STEP_MIN;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
@@ -77,8 +77,8 @@ public static void main (String argv[]) {
 
     //------------------------------------------------------ test specific fields
 
-    static final int lineForBreakInThread    = 137;
-    static final int[] checkedLines = { 138, 138, 178 };
+    static final int lineForBreakInThread    = 141;
+    static final int[] checkedLines = { 142, 142, 182 };
 
     //------------------------------------------------------ mutable common methods
 
@@ -247,7 +247,7 @@ private void setAndCheckStepEvent ( BreakpointRequest bpRequest,
             exitCode = FAILED;
         }
 
-        ThreadReference thread = debuggee.threadByNameOrThrow(threadName);
+        ThreadReference thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
         StepRequest stepRequest = setStepRequest( thread,
                                                   StepRequest.STEP_LINE,
                                                   stepDepth,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java
@@ -55,6 +55,10 @@ public class crstepreq003a {
 
     static Object waitnotifyObj = new Object();
 
+    static Thread thread0;
+    static Thread thread1;
+    static Thread thread2;
+
     //------------------------------------------------------ mutable common method
 
     public static void main (String argv[]) {
@@ -72,21 +76,21 @@ public static void main (String argv[]) {
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test case section
                 case 0:
 
-                    Thread thread0 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread0"));
+                    thread0 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread0"));
                     threadStart(thread0);
                     threadJoin (thread0, "0");
                     break;
 
                 case 1:
 
-                    Thread thread1 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread1"));
+                    thread1 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread1"));
                     threadStart(thread1);
                     threadJoin (thread1, "1");
                     break;
 
                 case 2:
 
-                    Thread thread2 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread2"));
+                    thread2 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread2"));
                     threadStart(thread2);
                     threadJoin (thread2, "2");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
@@ -77,9 +77,9 @@ public static void main (String argv[]) {
 
     //------------------------------------------------------ test specific fields
 
-    static final int lineForBreakInThread = 146;
-    static final int[] checkedLines = { 160, 160, 193 };
-    static final int[] checkedLinesAlt = { 161, 161, 193 };
+    static final int lineForBreakInThread = 149;
+    static final int[] checkedLines = { 163, 163, 196 };
+    static final int[] checkedLinesAlt = { 164, 164, 196 };
 
     //------------------------------------------------------ mutable common methods
 
@@ -248,7 +248,7 @@ private void setAndCheckStepEvent ( BreakpointRequest bpRequest,
             exitCode = FAILED;
         }
 
-        ThreadReference thread = debuggee.threadByNameOrThrow(threadName);
+        ThreadReference thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
         StepRequest stepRequest = setStepRequest( thread,
                                                   StepRequest.STEP_LINE,
                                                   stepDepth,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java
@@ -58,6 +58,9 @@ public class crstepreq004a {
     private static volatile boolean isFirstThreadReady = false;
     private static volatile boolean isSecondThreadReady = false;
 
+    static Thread thread1;
+    static Thread thread2;
+
     //------------------------------------------------------ mutable common method
 
     public static void main (String argv[]) {
@@ -95,8 +98,8 @@ public static void main (String argv[]) {
     private static void runTestCase(int testCaseId) {
         isFirstThreadReady = false;
         isSecondThreadReady = false;
-        Thread thread1 = JDIThreadFactory.newThread(new Thread1crstepreq004a("thread1"));
-        Thread thread2 = JDIThreadFactory.newThread(new Thread2crstepreq004a("thread2"));
+        thread1 = JDIThreadFactory.newThread(new Thread1crstepreq004a("thread1"));
+        thread2 = JDIThreadFactory.newThread(new Thread2crstepreq004a("thread2"));
         synchronized (lockObj) {
             thread1.start();
             while (!isFirstThreadReady) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
@@ -290,7 +290,7 @@ private void testRun()
                      testClassReference =
                           (ReferenceType) vm.classesByName(testedClassName).get(0);
 
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      eventRequest1 = setting21StepRequest(thread1, testClassReference,
                                               EventRequest.SUSPEND_NONE, property1);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
@@ -282,7 +282,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     ThreadReference thread1 = debuggee.threadByNameOrThrow("thread1");
+                     ThreadReference thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread1");
                      eventRequest1 = setting23StepRequest(thread1, testedClassName1,
                                               EventRequest.SUSPEND_NONE, property1);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                    thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_INTO");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_OVER");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_OUT");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_MIN");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_MIN,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_LINE");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
@@ -283,7 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_MIN");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_MIN,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
@@ -302,7 +302,7 @@ private void testRun()
             }
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
 
             String poppedMethod    = "poppedMethod";
@@ -311,7 +311,7 @@ private void testRun()
 
             log2("......setting breakpoint in poppedMethod");
             try {
-                breakpointRequest = settingBreakpoint(debuggee.threadByNameOrThrow(thread2Name),
+                breakpointRequest = settingBreakpoint(thread2Ref,
                                           debuggeeClass,
                                           poppedMethod, breakpointLine, "one");
             } catch ( Exception e ) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
@@ -270,10 +270,10 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             String thread3Name         = "thread3";
-            ThreadReference thread3Ref = debuggee.threadByNameOrThrow(thread3Name);
+            ThreadReference thread3Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread3Name);
 
             String poppedMethod    = "poppedMethod";
             String breakpointLine  = "breakpointLine";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
@@ -283,10 +283,10 @@ private void testRun()
 
 
         String thread2Name         = "thread2";
-        ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+        ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
         String thread3Name         = "thread3";
-        ThreadReference thread3Ref = debuggee.threadByNameOrThrow(thread3Name);
+        ThreadReference thread3Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread3Name);
 
         String poppedMethod    = "poppedMethod";
         String breakpointLine  = "breakpointLine";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
@@ -270,7 +270,7 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             StackFrame stackFrame = null;
             int var;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
@@ -274,7 +274,7 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             StackFrame stackFrame0 = null;
             StackFrame stackFrame1 = null;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
