Deal with Thread#getThreadId() warnings on JDK19

Author: eregon

src/main/java/org/truffleruby/RubyLanguage.java

@@ -575,7 +575,7 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
 
     @Override
     public void initializeThread(RubyContext context, Thread thread) {
-        LOGGER.fine(() -> "initializeThread(#" + thread.getId() + " " + thread + ")");
+        LOGGER.fine(() -> "initializeThread(#" + getThreadId(thread) + " " + thread + ")");
 
         if (thread == context.getThreadManager().getOrInitializeRootJavaThread()) {
             // Already initialized when creating the context
@@ -602,7 +602,7 @@ public void initializeThread(RubyContext context, Thread thread) {
 
     @Override
     public void disposeThread(RubyContext context, Thread thread) {
-        LOGGER.fine(() -> "disposeThread(#" + thread.getId() + " " + thread + " on " + getCurrentThread() + ")");
+        LOGGER.fine(() -> "disposeThread(#" + getThreadId(thread) + " " + thread + " on " + getCurrentThread() + ")");
 
         if (thread == context.getThreadManager().getRootJavaThread()) {
             if (context.getEnv().isPreInitialization()) {
@@ -865,4 +865,9 @@ private static String buildCoreLoadPath(String coreLoadPath) {
             throw CompilerDirectives.shouldNotReachHere(e);
         }
     }
+
+    @SuppressWarnings("deprecation") // deprecated on JDK19 by Thread#threadId, but that's added in JDK19
+    public static long getThreadId(Thread thread) {
+        return thread.getId();
+    }
 }

src/main/java/org/truffleruby/core/fiber/FiberManager.java

@@ -394,7 +394,7 @@ public String getFiberDebugInfo(RubyThread rubyThread) {
             if (thread == null) {
                 builder.append(" (no Java thread)");
             } else {
-                builder.append(" #").append(thread.getId()).append(' ').append(thread);
+                builder.append(" #").append(RubyLanguage.getThreadId(thread)).append(' ').append(thread);
             }
 
             if (fiber.isRootFiber()) {

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -142,7 +142,8 @@ private Thread createFiberJavaThread(RubyFiber fiber, SourceSection sourceSectio
 
         language.rubyThreadInitMap.put(thread, fiber.rubyThread);
         language.rubyFiberInitMap.put(thread, fiber);
-        thread.setName(FiberManager.NAME_PREFIX + " id=" + thread.getId() + " from " + context.fileLine(sourceSection));
+        thread.setName(FiberManager.NAME_PREFIX + " id=" + RubyLanguage.getThreadId(thread) + " from " +
+                context.fileLine(sourceSection));
         thread.setDaemon(true); // GR-33255
         rubyManagedThreads.add(thread); // need to be set before initializeThread()
         thread.setUncaughtExceptionHandler(uncaughtExceptionHandler(fiber));
@@ -164,7 +165,7 @@ private Thread createJavaThread(Runnable runnable, RubyThread rubyThread, String
 
         language.rubyThreadInitMap.put(thread, rubyThread);
         language.rubyFiberInitMap.put(thread, rubyThread.getRootFiber());
-        thread.setName(NAME_PREFIX + " id=" + thread.getId() + " from " + info);
+        thread.setName(NAME_PREFIX + " id=" + RubyLanguage.getThreadId(thread) + " from " + info);
         rubyManagedThreads.add(thread); // need to be set before initializeThread()
         thread.setUncaughtExceptionHandler(uncaughtExceptionHandler(rubyThread.getRootFiber()));
         return thread;

src/main/java/org/truffleruby/language/threadlocal/ThreadAndFrameLocalStorage.java

@@ -10,6 +10,7 @@
 package org.truffleruby.language.threadlocal;
 
 import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.Nil;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -26,12 +27,12 @@ public class ThreadAndFrameLocalStorage {
 
     public ThreadAndFrameLocalStorage(RubyContext context) {
         // Cannot store a Thread id while pre-initializing
-        originalThreadId = context.isPreInitializing() ? 0 : Thread.currentThread().getId();
+        originalThreadId = context.isPreInitializing() ? 0 : RubyLanguage.getThreadId(Thread.currentThread());
         originalThreadValue = Nil.INSTANCE;
     }
 
     public Object get(ConditionProfile sameThreadProfile) {
-        if (sameThreadProfile.profile(Thread.currentThread().getId() == originalThreadId)) {
+        if (sameThreadProfile.profile(RubyLanguage.getThreadId(Thread.currentThread()) == originalThreadId)) {
             return originalThreadValue;
         } else {
             return fallbackGet();
@@ -60,7 +61,7 @@ private Object fallbackGet() {
     }
 
     public void set(Object value, ConditionProfile sameThreadProfile) {
-        if (sameThreadProfile.profile(Thread.currentThread().getId() == originalThreadId)) {
+        if (sameThreadProfile.profile(RubyLanguage.getThreadId(Thread.currentThread()) == originalThreadId)) {
             originalThreadValue = value;
         } else {
             fallbackSet(value);