Skip to content

Commit b7ef5cb

Browse files
GoeLinGoeLin
committed
8350767: Fix -Wzero-as-null-pointer-constant warnings in nsk jni stress tests
Backport-of: c988d7d6476807bf71a977dc771017915b708ca3
1 parent 44e8394 commit b7ef5cb

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress001.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@ Java_nsk_stress_jni_JNIter001_jnistress (JNIEnv *env, jobject jobj, jstring jstr
7777
for (j = 0; j < DIGESTLENGTH; j++) {
7878
digest[j] = 0;
7979
}
80-
element->str[allocs] = env->GetStringUTFChars(jstr, 0); CE
80+
element->str[allocs] = env->GetStringUTFChars(jstr, nullptr); CE
8181
if (strlen(element->str[allocs]) != (size_t) env->GetStringUTFLength(jstr)) {
8282
printf("Length is wrong in string No. %d\n", allocs);
8383
} else {
@@ -177,7 +177,7 @@ Java_nsk_stress_jni_JNIter001_jnistress1(JNIEnv *env, jobject jobj, jstring jstr
177177
for (j = 0; j < DIGESTLENGTH; j++) {
178178
digest[j] = 0;
179179
}
180-
javachars->str[index] = env->GetStringChars(jstr, 0); CE
180+
javachars->str[index] = env->GetStringChars(jstr, nullptr); CE
181181
javachars->size[index] = env->GetStringUTFLength(jstr); CE
182182
elem_len = javachars->size[index];
183183
len += elem_len;

‎test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -171,14 +171,14 @@ Java_nsk_stress_jni_JNIter003_jniBodyChangeArray (JNIEnv *env, jobject jobj,
171171

172172
/* Take the elements from Java arrays into native buffers */
173173
/* Use Get<Type>ArrayElements */
174-
boolOrig = env->GetBooleanArrayElements((jbooleanArray) arrayOrig[BOOL], 0); CE
175-
byteOrig = env->GetByteArrayElements((jbyteArray) arrayOrig[BYTE], 0); CE
176-
charOrig = env->GetCharArrayElements((jcharArray) arrayOrig[CHAR], 0); CE
177-
shortOrig = env->GetShortArrayElements((jshortArray) arrayOrig[SHORT], 0); CE
178-
intOrig = env->GetIntArrayElements((jintArray) arrayOrig[INT], 0); CE
179-
longOrig = env->GetLongArrayElements((jlongArray) arrayOrig[LONG], 0); CE
180-
floatOrig = env->GetFloatArrayElements((jfloatArray) arrayOrig[FLOAT], 0); CE
181-
doubleOrig = env->GetDoubleArrayElements((jdoubleArray) arrayOrig[DOUBLE], 0); CE
174+
boolOrig = env->GetBooleanArrayElements((jbooleanArray) arrayOrig[BOOL], nullptr); CE
175+
byteOrig = env->GetByteArrayElements((jbyteArray) arrayOrig[BYTE], nullptr); CE
176+
charOrig = env->GetCharArrayElements((jcharArray) arrayOrig[CHAR], nullptr); CE
177+
shortOrig = env->GetShortArrayElements((jshortArray) arrayOrig[SHORT], nullptr); CE
178+
intOrig = env->GetIntArrayElements((jintArray) arrayOrig[INT], nullptr); CE
179+
longOrig = env->GetLongArrayElements((jlongArray) arrayOrig[LONG], nullptr); CE
180+
floatOrig = env->GetFloatArrayElements((jfloatArray) arrayOrig[FLOAT], nullptr); CE
181+
doubleOrig = env->GetDoubleArrayElements((jdoubleArray) arrayOrig[DOUBLE], nullptr); CE
182182

183183
/* Alloc some memory for cloned arrays buffers */
184184
boolClone = (jboolean *)c_malloc(env, SIZE(BOOL) * sizeof(jboolean));

‎test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress004.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,13 @@ Java_nsk_stress_jni_JNIter004_CheckSum (JNIEnv *env, jobject jobj, jstring jstr)
4747
digest[i] = 0;
4848
}
4949
str = (char *)c_malloc(env, len * sizeof(char));
50-
/* const char *threadName = env->GetStringUTFChars(jstr, 0); */
50+
/* const char *threadName = env->GetStringUTFChars(jstr, nullptr); */
5151

5252
CHECK(env->MonitorEnter(jobj));
5353
if (upper == 0) {
5454
tmp = (jchar *) c_malloc(env, DIGESTLENGTH * sizeof(char));
5555
}
56-
critstr = env->GetStringCritical(jstr, 0); CE
56+
critstr = env->GetStringCritical(jstr, nullptr); CE
5757
for (i = 0; i < len; i++) {
5858
str[i] = (char) critstr[i];
5959
}
@@ -101,7 +101,7 @@ Java_nsk_stress_jni_JNIter004_CheckCompare (JNIEnv *env, jobject jobj, jstring j
101101
return JNI_FALSE;
102102
}
103103
tmp = (jchar *)c_malloc(env, DIGESTLENGTH * sizeof(char));
104-
critstr = env->GetStringCritical(jstr, 0); CE
104+
critstr = env->GetStringCritical(jstr, nullptr); CE
105105
for (i = 0; i < strlen; i++) {
106106
str[i] = (char) critstr[i];
107107
}
@@ -121,7 +121,7 @@ Java_nsk_stress_jni_JNIter004_CheckCompare (JNIEnv *env, jobject jobj, jstring j
121121
/* Compare */
122122
/* env->MonitorEnter(jobj); */
123123

124-
ch = (jchar *)env->GetPrimitiveArrayCritical(cArr, 0); CE
124+
ch = (jchar *)env->GetPrimitiveArrayCritical(cArr, nullptr); CE
125125

126126
printf("Comparing: ");
127127
for (i = 0; i < len; i++) {

‎test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress006.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ extern "C" {
3131
JNIEXPORT jboolean JNICALL
3232
Java_nsk_stress_jni_JNIter006_refs (JNIEnv *env, jobject jobj, jobject tobj, jint LIMIT) {
3333

34-
static jobject *globRefsArray = 0;
34+
static jobject *globRefsArray = nullptr;
3535
static int upper = 0;
3636

3737
jclass clazz;

‎test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Java_nsk_stress_jni_JNIter007_incCount (JNIEnv *env, jobject jobj, jstring name)
3232
jclass clazz;
3333
jfieldID fld;
3434
jint value;
35-
const char *str = env->GetStringUTFChars(name, 0); CE
35+
const char *str = env->GetStringUTFChars(name, nullptr); CE
3636

3737
CHECK(env->MonitorEnter(jobj));
3838
clazz = env->GetObjectClass(jobj); CE

0 commit comments

Comments
 (0)