8241750: x86_32 build failure after JDK-8227269

shipilev · shipilev · commit 9e9f110d0595 · 2020-03-27T19:05:07.000+01:00
Reviewed-by: rkennke, cjplummer
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c b/src/jdk.jdwp.agent/share/native/libjdwp/classTrack.c
@@ -69,7 +69,7 @@ cbTrackingObjectFree(jvmtiEnv* jvmti_env, jlong tag)
       debugMonitorExit(classTrackLock);
       return;
     }
-    *(char**)bagAdd(deletedSignatures) = (char*)tag;
+    *(char**)bagAdd(deletedSignatures) = (char*)jlong_to_ptr(tag);
 
     debugMonitorExit(classTrackLock);
 }
@@ -117,7 +117,7 @@ classTrack_addPreparedClass(JNIEnv *env_unused, jclass klass)
     if (error != JVMTI_ERROR_NONE) {
         EXIT_ERROR(error,"signature");
     }
-    error = JVMTI_FUNC_PTR(trackingEnv, SetTag)(env, klass, (jlong)signature);
+    error = JVMTI_FUNC_PTR(trackingEnv, SetTag)(env, klass, ptr_to_jlong(signature));
     if (error != JVMTI_ERROR_NONE) {
         jvmtiDeallocate(signature);
         EXIT_ERROR(error,"SetTag");

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ cbTrackingObjectFree(jvmtiEnv* jvmti_env, jlong tag)`
`69`	`69`	`debugMonitorExit(classTrackLock);`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`		`- (char)bagAdd(deletedSignatures) = (char)tag;`
	`72`	`+ (char)bagAdd(deletedSignatures) = (char)jlong_to_ptr(tag);`
`73`	`73`
`74`	`74`	`debugMonitorExit(classTrackLock);`
`75`	`75`	`}`
`@@ -117,7 +117,7 @@ classTrack_addPreparedClass(JNIEnv *env_unused, jclass klass)`
`117`	`117`	`if (error != JVMTI_ERROR_NONE) {`
`118`	`118`	`EXIT_ERROR(error,"signature");`
`119`	`119`	`}`
`120`		`- error = JVMTI_FUNC_PTR(trackingEnv, SetTag)(env, klass, (jlong)signature);`
	`120`	`+ error = JVMTI_FUNC_PTR(trackingEnv, SetTag)(env, klass, ptr_to_jlong(signature));`
`121`	`121`	`if (error != JVMTI_ERROR_NONE) {`
`122`	`122`	`jvmtiDeallocate(signature);`
`123`	`123`	`EXIT_ERROR(error,"SetTag");`