Skip to content

Commit 3258b52

Browse files
authored
Merge pull request #18740 from keithc-ca/JVM_RegisterUnsafeMethods
Remove unused function JVM_RegisterUnsafeMethods()
2 parents 78e3e30 + b85287d commit 3258b52

File tree

6 files changed

+2
-18
lines changed

6 files changed

+2
-18
lines changed

runtime/j9vm/exports.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ jvm_add_exports(jvm
115115
_JVM_Recv@16
116116
_JVM_RecvFrom@24
117117
_JVM_RegisterSignal@8
118-
_JVM_RegisterUnsafeMethods@8
119118
_JVM_Send@16
120119
_JVM_SendTo@24
121120
_JVM_SetLength@12

runtime/j9vm/j9scar.tdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ TraceEntry=Trc_SC_RecvFrom_Entry NoEnv Overhead=1 Level=1 Template="JVM_RecvFrom
250250
TraceExit=Trc_SC_RecvFrom_Exit NoEnv Overhead=1 Level=1 Template="JVM_RecvFrom -- return %d, *length=%d"
251251

252252
TraceEvent=Trc_SC_RegisterSignal NoEnv Overhead=1 Level=1 Template="JVM_RegisterSignal (not implemented -- returning -1)"
253-
TraceEvent=Trc_SC_RegisterUnsafeMethods Overhead=1 Level=1 Template="JVM_RegisterUnsafeMethods (not implemented -- returning)"
253+
TraceEvent=Trc_SC_RegisterUnsafeMethods Obsolete Overhead=1 Level=1 Template="JVM_RegisterUnsafeMethods (not implemented -- returning)"
254254

255255
TraceEntry=Trc_SC_Send_Entry NoEnv Overhead=1 Level=1 Template="JVM_Send(descriptor=%d, buffer=%p, length=%d, flags=%d)"
256256
TraceExit=Trc_SC_Send_Exit NoEnv Overhead=1 Level=1 Template="JVM_Send -- return %d"

runtime/j9vm/j9vmnatives.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
124124
<export name="_JVM_Recv@16" />
125125
<export name="_JVM_RecvFrom@24" />
126126
<export name="_JVM_RegisterSignal@8" />
127-
<export name="_JVM_RegisterUnsafeMethods@8" />
128127
<export name="_JVM_Send@16" />
129128
<export name="_JVM_SendTo@24" />
130129
<export name="_JVM_SetLength@12" />

runtime/j9vm/jvm.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5728,19 +5728,6 @@ JVM_SupportsCX8(void)
57285728
}
57295729
#endif /* JAVA_SPEC_VERSION < 22 */
57305730

5731-
5732-
/**
5733-
* Method stub for method not yet implemented. Required for 1.4 support.
5734-
*/
5735-
void JNICALL
5736-
JVM_RegisterUnsafeMethods(JNIEnv* env, jclass unsafeClz)
5737-
{
5738-
5739-
Trc_SC_RegisterUnsafeMethods(env);
5740-
5741-
}
5742-
5743-
57445731
jint JNICALL
57455732
JVM_ActiveProcessorCount(void)
57465733
{

runtime/redirector/forwarders.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ _X(JVM_Read,JNICALL,true,jint,jint descriptor, char *buffer, jint bytesToRead)
109109
_X(JVM_Recv,JNICALL,true,jint,jint descriptor, char *buffer, jint length, jint flags)
110110
_X(JVM_RecvFrom,JNICALL,true,jint,jint descriptor, char *buffer, jint length, jint flags, struct sockaddr *fromAddr, int *fromLength)
111111
_X(JVM_RegisterSignal,JNICALL,true,void *,jint sigNum, void *handler)
112-
_X(JVM_RegisterUnsafeMethods,JNICALL,true,void,JNIEnv *env, jclass unsafeClz)
113112
_X(JVM_Send,JNICALL,true,jint,jint descriptor, const char *buffer, jint numBytes, jint flags)
114113
_X(JVM_SendTo,JNICALL,true,jint,jint descriptor, const char *buffer, jint length, jint flags, const struct sockaddr *toAddr, int toLength)
115114
_X(JVM_SetLength,JNICALL,true,jint,jint fd, jlong length)

runtime/sunvmi/sunvmi.tdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ TraceEntry=Trc_SunVMI_RecvFrom_Entry NoEnv Overhead=1 Level=1 Template="JVM_Recv
252252
TraceExit=Trc_SunVMI_RecvFrom_Exit NoEnv Overhead=1 Level=1 Template="JVM_RecvFrom -- return %d, *length=%d"
253253

254254
TraceEvent=Trc_SunVMI_RegisterSignal NoEnv Overhead=1 Level=1 Template="JVM_RegisterSignal (not implemented -- returning -1)"
255-
TraceEvent=Trc_SunVMI_RegisterUnsafeMethods Overhead=1 Level=1 Template="JVM_RegisterUnsafeMethods (not implemented -- returning)"
255+
TraceEvent=Trc_SunVMI_RegisterUnsafeMethods Obsolete Overhead=1 Level=1 Template="JVM_RegisterUnsafeMethods (not implemented -- returning)"
256256

257257
TraceEntry=Trc_SunVMI_Send_Entry NoEnv Overhead=1 Level=1 Template="JVM_Send(descriptor=%d, buffer=%p, length=%d, flags=%d)"
258258
TraceExit=Trc_SunVMI_Send_Exit NoEnv Overhead=1 Level=1 Template="JVM_Send -- return %d"

0 commit comments

Comments
 (0)