[GR-42730] Fix warnings on JDK 20

timfel · timfel · commit 51e1c206f04d · 2023-01-23T20:37:13.000+01:00
diff --git a/graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ProcessingError.java b/graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ProcessingError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,7 +44,7 @@
 
 final class ProcessingError extends Exception {
     private static final long serialVersionUID = -7741682404828028813L;
-    private final Element element;
+    private final transient Element element;
 
     ProcessingError(Element element, String fmt, Object... args) {
         super(String.format(fmt, args));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/LocaleModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/LocaleModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -88,6 +88,7 @@ public class LocaleModuleBuiltins extends PythonBuiltins {
     static final int CHAR_MAX = 127;
 
     @TruffleBoundary
+    @SuppressWarnings("deprecation") // remove once we move to Java 21
     public static Locale fromPosix(TruffleString tposixLocaleId) {
         // format: [language[_territory][.variant][@modifier]]
         // 2 lower _ 2 UPPER .
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -312,8 +312,8 @@ static final class MarshalError extends RuntimeException {
             static final long serialVersionUID = 5323687983726237118L;
 
             final PythonBuiltinClassType type;
-            final TruffleString message;
-            final Object[] arguments;
+            final transient TruffleString message;
+            final transient Object[] arguments;
 
             MarshalError(PythonBuiltinClassType type, TruffleString message, Object... arguments) {
                 super(null, null);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MultiprocessingModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MultiprocessingModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -60,6 +60,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.thread.PSemLock;
+import com.oracle.graal.python.builtins.objects.thread.PThread;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
@@ -201,7 +202,7 @@ abstract static class GetTidNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         long getTid() {
-            return convertTid(getContext().getMainThread().getId());
+            return convertTid(PThread.getThreadId(getContext().getMainThread()));
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ResourceModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ResourceModuleBuiltins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.thread.PThread;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.StructSequence;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -122,7 +123,7 @@ abstract static class GetRuUsageNode extends PythonBuiltinNode {
         @Specialization(guards = {"who == RUSAGE_THREAD"})
         @TruffleBoundary
         PTuple getruusageThread(@SuppressWarnings("unused") int who) {
-            long id = Thread.currentThread().getId();
+            long id = PThread.getThreadId(Thread.currentThread());
             Runtime runtime = Runtime.getRuntime();
 
             double ru_utime = 0; // time in user mode (float)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -178,6 +178,7 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes;
 import com.oracle.graal.python.builtins.objects.str.StringUtils;
+import com.oracle.graal.python.builtins.objects.thread.PThread;
 import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;
 import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
@@ -853,7 +854,7 @@ Object currentFrames(VirtualFrame frame,
             }
             PFrame currentFrame = readCallerFrameNode.executeWith(frame, 0);
             PDict result = factory().createDict();
-            result.setDictStorage(setHashingStorageItem.execute(frame, result.getDictStorage(), Thread.currentThread().getId(), currentFrame));
+            result.setDictStorage(setHashingStorageItem.execute(frame, result.getDictStorage(), PThread.getThreadId(Thread.currentThread()), currentFrame));
             return result;
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java
@@ -149,7 +149,7 @@ public abstract static class GetCurrentThreadIdNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         public static long getId() {
-            return Thread.currentThread().getId();
+            return PThread.getThreadId(Thread.currentThread());
         }
     }
 
@@ -159,7 +159,7 @@ public abstract static class GetNativeIdNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
         public static long getId() {
-            return Thread.currentThread().getId();
+            return PThread.getThreadId(Thread.currentThread());
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/LoadCExtException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/LoadCExtException.java
@@ -50,9 +50,9 @@
 public abstract class LoadCExtException extends Exception {
     private static final long serialVersionUID = 3517291912314595890L;
     protected final PException cause;
-    protected final Object name;
-    protected final TruffleString formatString;
-    protected final Object[] formatArgs;
+    protected final transient Object name;
+    protected final transient TruffleString formatString;
+    protected final transient Object[] formatArgs;
 
     protected LoadCExtException(PException cause, TruffleString name, TruffleString formatString, Object[] formatArgs) {
         /*
@@ -94,7 +94,7 @@ public PException reraise(PConstructAndRaiseNode raiseNode, VirtualFrame frame)
 
     public static final class ImportException extends LoadCExtException {
         private static final long serialVersionUID = 7862376523476548L;
-        private final Object path;
+        private final transient Object path;
 
         public ImportException(PException cause, TruffleString name, TruffleString path, TruffleString formatString, Object... formatArgs) {
             super(cause, name, formatString, formatArgs);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PRLock.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PRLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -56,7 +56,7 @@ private static class InternalReentrantLock extends ReentrantLock {
         long getOwnerId() {
             Thread owner = getOwner();
             if (owner != null) {
-                return owner.getId();
+                return PThread.getThreadId(owner);
             }
             return 0;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PSemLock.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PSemLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -72,7 +72,7 @@ public PSemLock(Object cls, Shape instanceShape, TruffleString name, int kind, S
     protected boolean acquireNonBlocking() {
         boolean ret = semaphore.tryAcquire();
         if (ret) {
-            lastThreadID = Thread.currentThread().getId();
+            lastThreadID = PThread.getThreadId(Thread.currentThread());
             count++;
         }
         return ret;
@@ -87,7 +87,7 @@ protected boolean acquireBlocking(Node node) {
             b[0] = true;
         }, semaphore);
         if (b[0]) {
-            lastThreadID = Thread.currentThread().getId();
+            lastThreadID = PThread.getThreadId(Thread.currentThread());
             count++;
         }
         return b[0];
@@ -99,7 +99,7 @@ protected boolean acquireTimeout(Node node, long timeout) {
         boolean[] b = new boolean[1];
         TruffleSafepoint.setBlockedThreadInterruptible(node, (s) -> b[0] = s.tryAcquire(timeout, TimeUnit.MILLISECONDS), semaphore);
         if (b[0]) {
-            lastThreadID = Thread.currentThread().getId();
+            lastThreadID = PThread.getThreadId(Thread.currentThread());
             count++;
         }
         return b[0];
@@ -129,7 +129,7 @@ public int getCount() {
 
     public void increaseCount() {
         count++;
-        lastThreadID = Thread.currentThread().getId();
+        lastThreadID = PThread.getThreadId(Thread.currentThread());
     }
 
     public void decreaseCount() {
@@ -138,7 +138,7 @@ public void decreaseCount() {
 
     @TruffleBoundary
     public boolean isMine() {
-        return count > 0 && lastThreadID == Thread.currentThread().getId();
+        return count > 0 && lastThreadID == PThread.getThreadId(Thread.currentThread());
     }
 
     public boolean isZero() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PThread.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -60,8 +60,12 @@ public void start() {
         }
     }
 
-    @TruffleBoundary
     public long getId() {
+        return getThreadId(thread);
+    }
+
+    @SuppressWarnings("deprecation") // remove once we move to Java 21
+    public static long getThreadId(Thread thread) {
         return thread.getId();
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -1939,7 +1939,7 @@ private TruffleString getModuleNameFromGlobals(PythonObject globals, HashingStor
 
     @ImportStatic({SpecialMethodNames.class, SpecialAttributeNames.class, SpecialMethodSlot.class})
     protected abstract static class AllocateTypeWithMetaclassNode extends Node implements IndirectCallNode {
-        private static final long SIZEOF_PY_OBJECT_PTR = Long.BYTES;
+        private static final int SIZEOF_PY_OBJECT_PTR = Long.BYTES;
 
         @Child private GetAnyAttributeNode getAttrNode;
         @Child private ReadAttributeFromObjectNode readAttr;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/OpCodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/OpCodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -882,8 +882,8 @@ public static OpCodes fromOpCode(byte opcode) {
         this.producesStackItems = quickens.producesStackItems;
         this.generalizesTo = generalizesTo;
         this.quickens = quickens;
-        quickens.quickenInputTypes |= inputType;
-        quickens.quickenOutputTypes |= outputType;
+        quickens.quickenInputTypes |= (byte) inputType;
+        quickens.quickenOutputTypes |= (byte) outputType;
     }
 
     public byte canQuickenInputTypes() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/NonMappingException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/NonMappingException.java
@@ -46,7 +46,7 @@ public final class NonMappingException extends StacktracelessCheckedException {
 
     private static final long serialVersionUID = -5215981713505181732L;
 
-    private final Object object;
+    private final transient Object object;
 
     public NonMappingException(Object object) {
         this.object = object;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/SameDictKeyException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/SameDictKeyException.java
@@ -47,7 +47,7 @@ public final class SameDictKeyException extends StacktracelessCheckedException {
 
     private static final long serialVersionUID = 301451134733299948L;
 
-    private final TruffleString key;
+    private final transient TruffleString key;
 
     public SameDictKeyException(TruffleString key) {
         this.key = key;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/GeneratorReturnException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/GeneratorReturnException.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.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,7 +45,7 @@
 public final class GeneratorReturnException extends PythonControlFlowException {
     private static final long serialVersionUID = -7509673125893533425L;
 
-    public final Object value;
+    public final transient Object value;
 
     public GeneratorReturnException(Object value) {
         this.value = value;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/WrapTpNew.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/WrapTpNew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -76,9 +76,9 @@ public final class WrapTpNew extends SlotWrapper {
     // we cache two node classes here, otherwise we use a truffle boundary lookup
     @CompilationFinal(dimensions = 1) private final Pair<?, ?>[] cachedFactoriesNodeClasses = new Pair<?, ?>[2];
 
-    private static final short NOT_SUBTP_STATE = 0b10000000;
-    private static final short NOT_CLASS_STATE = 0b01000000;
-    private static final short IS_UNSAFE_STATE = 0b00100000;
+    private static final byte NOT_SUBTP_STATE = 0b100;
+    private static final byte NOT_CLASS_STATE = 0b010;
+    private static final byte IS_UNSAFE_STATE = 0b001;
 
     public WrapTpNew(BuiltinCallNode func, PythonBuiltinClassType owner) {
         super(func);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixSupportLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixSupportLibrary.java
@@ -833,7 +833,7 @@ public static class GetAddrInfoException extends Exception {
         private static final long serialVersionUID = 3013253817849329391L;
 
         private final int errorCode;
-        private final TruffleString msg;
+        private final transient TruffleString msg;
 
         public GetAddrInfoException(int errorCode, TruffleString message) {
             super(message.toJavaStringUncached());
@@ -926,7 +926,7 @@ public static final class PosixException extends Exception {
         private static final long serialVersionUID = -115762483478883093L;
 
         private final int errorCode;
-        private final TruffleString msg;
+        private final transient TruffleString msg;
 
         public PosixException(int errorCode, TruffleString message) {
             this.errorCode = errorCode;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java
@@ -126,6 +126,7 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.StringReplaceNode;
 import com.oracle.graal.python.builtins.objects.thread.PLock;
+import com.oracle.graal.python.builtins.objects.thread.PThread;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
@@ -1112,7 +1113,7 @@ public long spawnTruffleContext(int fd, int sentinel, int[] fdsToKeep) {
                         // option("python.PosixModuleBackend", "java").//
                         config(PythonContext.CHILD_CONTEXT_DATA, data);
         Thread thread = data.parentCtx.env.createThread(new ChildContextThread(fd, sentinel, data, builder));
-        long tid = thread.getId();
+        long tid = PThread.getThreadId(thread);
         getSharedMultiprocessingData().putChildContextThread(tid, thread);
         getSharedMultiprocessingData().putChildContextData(tid, data);
         for (int fdToKeep : fdsToKeep) {
@@ -2341,7 +2342,7 @@ public synchronized void disposeThread(Thread thread) {
         threadStateMapping.remove(thread);
         ts.dispose();
         releaseSentinelLock(ts.sentinelLock);
-        getSharedMultiprocessingData().removeChildContextThread(thread.getId());
+        getSharedMultiprocessingData().removeChildContextThread(PThread.getThreadId(thread));
     }
 
     private static void releaseSentinelLock(WeakReference<PLock> sentinelLockWeakref) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java
@@ -79,11 +79,11 @@ public final class PException extends AbstractTruffleException {
     public static final PException NO_EXCEPTION = new PException(null, null);
 
     private String message = null;
-    protected final PBaseException pythonException;
-    private PFrame.Reference frameInfo;
-    private PBytecodeRootNode catchRootNode;
+    protected final transient PBaseException pythonException;
+    private transient PFrame.Reference frameInfo;
+    private transient PBytecodeRootNode catchRootNode;
     private int catchBci;
-    private LazyTraceback traceback;
+    private transient LazyTraceback traceback;
     private boolean reified = false;
     private boolean skipFirstTracebackFrame;
     private int tracebackFrameCount;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PIncompleteSourceException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PIncompleteSourceException.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.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -57,7 +57,7 @@ public class PIncompleteSourceException extends AbstractTruffleException {
 
     private static final long serialVersionUID = 4393080397807767467L;
 
-    private Source source;
+    private transient Source source;
     private final int line;
 
     public PIncompleteSourceException(String message, Throwable cause, int line, Source source) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStoreException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStoreException.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/NumericSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/NumericSupport.java

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@`
`178`	`178`	`import com.oracle.graal.python.builtins.objects.str.PString;`
`179`	`179`	`import com.oracle.graal.python.builtins.objects.str.StringNodes;`
`180`	`180`	`import com.oracle.graal.python.builtins.objects.str.StringUtils;`
	`181`	`+import com.oracle.graal.python.builtins.objects.thread.PThread;`
`181`	`182`	`import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;`
`182`	`183`	`import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;`
`183`	`184`	`import com.oracle.graal.python.builtins.objects.traceback.PTraceback;`
`@@ -853,7 +854,7 @@ Object currentFrames(VirtualFrame frame,`
`853`	`854`	`}`
`854`	`855`	`PFrame currentFrame = readCallerFrameNode.executeWith(frame, 0);`
`855`	`856`	`PDict result = factory().createDict();`
`856`		`- result.setDictStorage(setHashingStorageItem.execute(frame, result.getDictStorage(), Thread.currentThread().getId(), currentFrame));`
	`857`	`+ result.setDictStorage(setHashingStorageItem.execute(frame, result.getDictStorage(), PThread.getThreadId(Thread.currentThread()), currentFrame));`
`857`	`858`	`return result;`
`858`	`859`	`}`
`859`	`860`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public abstract static class GetCurrentThreadIdNode extends PythonBuiltinNode {`
`149`	`149`	`@Specialization`
`150`	`150`	`@TruffleBoundary`
`151`	`151`	`public static long getId() {`
`152`		`- return Thread.currentThread().getId();`
	`152`	`+ return PThread.getThreadId(Thread.currentThread());`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`@@ -159,7 +159,7 @@ public abstract static class GetNativeIdNode extends PythonBuiltinNode {`
`159`	`159`	`@Specialization`
`160`	`160`	`@TruffleBoundary`
`161`	`161`	`public static long getId() {`
`162`		`- return Thread.currentThread().getId();`
	`162`	`+ return PThread.getThreadId(Thread.currentThread());`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -56,7 +56,7 @@ private static class InternalReentrantLock extends ReentrantLock {`
`56`	`56`	`long getOwnerId() {`
`57`	`57`	`Thread owner = getOwner();`
`58`	`58`	`if (owner != null) {`
`59`		`- return owner.getId();`
	`59`	`+ return PThread.getThreadId(owner);`
`60`	`60`	`}`
`61`	`61`	`return 0;`
`62`	`62`	`}`