From 821fd83c9e3f0fab85fcbb3ca1acf16e3492a733 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Sun, 17 Dec 2023 16:57:26 -0800
Subject: [PATCH] WIP

---
 core/src/main/resources/natives.xml           | 29 +++++++++++++++++++
 .../core/tests/callGraph/LibModelsTest.java   |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/natives.xml b/core/src/main/resources/natives.xml
index 034159ec4c..2f535ae877 100644
--- a/core/src/main/resources/natives.xml
+++ b/core/src/main/resources/natives.xml
@@ -490,6 +490,15 @@
 						fieldType="Ljava/lang/Runnable" ref="arg0" value="arg0" />
 					<putfield class="Ljava/lang/Thread" field="target"
 						fieldType="Ljava/lang/Runnable" ref="arg0" value="arg0" />
+					<!-- for JDK 21 -->
+					<new def="x"
+						class="Ljava/lang/Thread/FieldHolder" />
+					<putfield class="Ljava/lang/Thread" field="holder"
+						fieldType="Ljava/lang/Thread/FieldHolder" ref="arg0" value="x" />
+					<getfield class="Ljava/lang/Thread" field="holder"
+						fieldType="Ljava/lang/Thread/FieldHolder" def="h" ref="arg0" />
+					<putfield class="Ljava/lang/Thread/FieldHolder" field="task"
+						fieldType="Ljava/lang/Runnable" ref="h" value="arg0" />
 				</method>
 				<method name="&lt;init&gt;"
 					descriptor="(Ljava/lang/Runnable;)V">
@@ -497,6 +506,15 @@
 						fieldType="Ljava/lang/Runnable" ref="arg0" value="arg1" />
 					<putfield class="Ljava/lang/Thread" field="target"
 						fieldType="Ljava/lang/Runnable" ref="arg0" value="arg1" />
+					<!-- for JDK 21 -->
+					<new def="x"
+						class="Ljava/lang/Thread/FieldHolder" />
+					<putfield class="Ljava/lang/Thread" field="holder"
+						fieldType="Ljava/lang/Thread/FieldHolder" ref="arg0" value="x" />
+					<getfield class="Ljava/lang/Thread" field="holder"
+						fieldType="Ljava/lang/Thread/FieldHolder" def="h" ref="arg0" />
+					<putfield class="Ljava/lang/Thread/FieldHolder" field="task"
+						fieldType="Ljava/lang/Runnable" ref="h" value="arg1" />
 				</method>
 				<method name="isAlive" descriptor="()Z"></method>
 				<method name="resume0" descriptor="()V" />
@@ -518,6 +536,17 @@
 						fieldType="Ljava/lang/Runnable" def="y" ref="arg0" />
 					<call type="interface" name="run"
 						class="Ljava/lang/Runnable" descriptor="()V" arg0="y" />
+					<!-- for JDK 21 -->
+					<getfield class="Ljava/lang/Thread" field="holder"
+						fieldType="Ljava/lang/Thread/FieldHolder" def="h" ref="arg0" />
+					<putfield class="Ljava/lang/Thread/FieldHolder" field="task"
+						fieldType="Ljava/lang/Runnable" ref="h" value="arg0" />
+					<getfield class="Ljava/lang/Thread/FieldHolder" field="task"
+						fieldType="Ljava/lang/Runnable" def="z" ref="h" />
+					<call type="interface" name="run"
+						class="Ljava/lang/Runnable" descriptor="()V" arg0="z" />
+					<!--<call type="interface" name="run"
+						class="Ljava/lang/Runnable" descriptor="()V" arg0="arg0" />-->
 				</method>
 				<method name="stop0" descriptor="()V" />
 				<method name="yield" descriptor="()V" static="true" />
diff --git a/core/src/test/java/com/ibm/wala/core/tests/callGraph/LibModelsTest.java b/core/src/test/java/com/ibm/wala/core/tests/callGraph/LibModelsTest.java
index 214af5d3cd..3fc679cb65 100644
--- a/core/src/test/java/com/ibm/wala/core/tests/callGraph/LibModelsTest.java
+++ b/core/src/test/java/com/ibm/wala/core/tests/callGraph/LibModelsTest.java
@@ -47,7 +47,7 @@ public void testLibModels()
 
     CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, false);
 
-    // System.err.println(cg);
+    System.err.println(cg);
 
     // Find node corresponding to finalize
     TypeReference t =