Skip to content

Commit 2057594

Browse files
author
Kim Barrett
committed
8337782: Use THROW_NULL instead of THROW_0 in pointer contexts in prims code
Reviewed-by: shade, dholmes
1 parent 73718fb commit 2057594

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

‎src/hotspot/share/prims/jni.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
10741074
TempNewSymbol signature = SymbolTable::probe(sig, (int)strlen(sig));
10751075

10761076
if (name == nullptr || signature == nullptr) {
1077-
THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), name_str);
1077+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), name_str);
10781078
}
10791079

10801080
oop mirror = JNIHandles::resolve_non_null(clazz);
@@ -1084,7 +1084,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
10841084
// primitive java.lang.Class
10851085
if (java_lang_Class::is_primitive(mirror)) {
10861086
ResourceMark rm(THREAD);
1087-
THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
1087+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
10881088
}
10891089

10901090
// Make sure class is linked and initialized before handing id's out to
@@ -1108,7 +1108,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
11081108
}
11091109
if (m == nullptr || (m->is_static() != is_static)) {
11101110
ResourceMark rm(THREAD);
1111-
THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
1111+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
11121112
}
11131113
return m->jmethod_id();
11141114
}
@@ -1762,7 +1762,7 @@ JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
17621762
TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig));
17631763
if (fieldname == nullptr || signame == nullptr) {
17641764
ResourceMark rm;
1765-
THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
1765+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
17661766
}
17671767

17681768
// Make sure class is initialized before handing id's out to fields
@@ -1772,7 +1772,7 @@ JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
17721772
if (!k->is_instance_klass() ||
17731773
!InstanceKlass::cast(k)->find_field(fieldname, signame, false, &fd)) {
17741774
ResourceMark rm;
1775-
THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
1775+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
17761776
}
17771777

17781778
// A jfieldID for a non-static field is simply the offset of the field within the instanceOop
@@ -1986,7 +1986,7 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
19861986
TempNewSymbol fieldname = SymbolTable::probe(name, (int)strlen(name));
19871987
TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig));
19881988
if (fieldname == nullptr || signame == nullptr) {
1989-
THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
1989+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
19901990
}
19911991
Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz));
19921992
// Make sure class is initialized before handing id's out to static fields
@@ -1995,7 +1995,7 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
19951995
fieldDescriptor fd;
19961996
if (!k->is_instance_klass() ||
19971997
!InstanceKlass::cast(k)->find_field(fieldname, signame, true, &fd)) {
1998-
THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
1998+
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
19991999
}
20002000

20012001
// A jfieldID for a static field is a JNIid specifying the field holder and the offset within the Klass*
@@ -2309,7 +2309,7 @@ JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, js
23092309
ResourceMark rm(THREAD);
23102310
stringStream ss;
23112311
ss.print("Index %d out of bounds for length %d", index, a->length());
2312-
THROW_MSG_0(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
2312+
THROW_MSG_NULL(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
23132313
}
23142314
JNI_END
23152315

‎src/hotspot/share/prims/jvm.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ JVM_ENTRY(jobject, JVM_Clone(JNIEnv* env, jobject handle))
691691
(klass->is_instance_klass() &&
692692
InstanceKlass::cast(klass)->reference_type() != REF_NONE)) {
693693
ResourceMark rm(THREAD);
694-
THROW_MSG_0(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
694+
THROW_MSG_NULL(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
695695
}
696696

697697
// Make shallow object copy
@@ -791,7 +791,7 @@ JVM_ENTRY(jclass, JVM_FindPrimitiveClass(JNIEnv* env, const char* utf))
791791
mirror = Universe::java_mirror(t);
792792
}
793793
if (mirror == nullptr) {
794-
THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), (char*) utf);
794+
THROW_MSG_NULL(vmSymbols::java_lang_ClassNotFoundException(), (char*) utf);
795795
} else {
796796
return (jclass) JNIHandles::make_local(THREAD, mirror);
797797
}
@@ -952,7 +952,7 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
952952
Klass* lookup_k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(lookup));
953953
// Lookup class must be a non-null instance
954954
if (lookup_k == nullptr) {
955-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
955+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
956956
}
957957
assert(lookup_k->is_instance_klass(), "Lookup class must be an instance klass");
958958

@@ -979,20 +979,20 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
979979
if (!is_hidden) {
980980
// classData is only applicable for hidden classes
981981
if (classData != nullptr) {
982-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "classData is only applicable for hidden classes");
982+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "classData is only applicable for hidden classes");
983983
}
984984
if (is_nestmate) {
985-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "dynamic nestmate is only applicable for hidden classes");
985+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "dynamic nestmate is only applicable for hidden classes");
986986
}
987987
if (!is_strong) {
988-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "an ordinary class must be strongly referenced by its defining loader");
988+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "an ordinary class must be strongly referenced by its defining loader");
989989
}
990990
if (vm_annotations) {
991-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "vm annotations only allowed for hidden classes");
991+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "vm annotations only allowed for hidden classes");
992992
}
993993
if (flags != STRONG_LOADER_LINK) {
994-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
995-
err_msg("invalid flag 0x%x", flags));
994+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
995+
err_msg("invalid flag 0x%x", flags));
996996
}
997997
}
998998

@@ -1047,7 +1047,7 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
10471047

10481048
if ((!is_hidden || is_nestmate) && !Reflection::is_same_class_package(lookup_k, ik)) {
10491049
// non-hidden class or nestmate class must be in the same package as the Lookup class
1050-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class and defined class are in different packages");
1050+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class and defined class are in different packages");
10511051
}
10521052

10531053
if (init) {
@@ -1078,7 +1078,7 @@ JVM_ENTRY(jclass, JVM_LookupDefineClass(JNIEnv *env, jclass lookup, const char *
10781078
jsize len, jobject pd, jboolean initialize, int flags, jobject classData))
10791079

10801080
if (lookup == nullptr) {
1081-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
1081+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
10821082
}
10831083

10841084
assert(buf != nullptr, "buf must not be null");
@@ -1703,8 +1703,8 @@ JVM_ENTRY(jobjectArray, JVM_GetMethodParameters(JNIEnv *env, jobject method))
17031703
bounds_check(cp, index, CHECK_NULL);
17041704

17051705
if (0 != index && !mh->constants()->tag_at(index).is_utf8()) {
1706-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
1707-
"Wrong type at constant pool index");
1706+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
1707+
"Wrong type at constant pool index");
17081708
}
17091709

17101710
}
@@ -2133,7 +2133,7 @@ JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAt(JNIEnv *env, jobject obj, jobject u
21332133
bounds_check(cp, index, CHECK_NULL);
21342134
constantTag tag = cp->tag_at(index);
21352135
if (!tag.is_klass() && !tag.is_unresolved_klass()) {
2136-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2136+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
21372137
}
21382138
Klass* k = cp->klass_at(index, CHECK_NULL);
21392139
return (jclass) JNIHandles::make_local(THREAD, k->java_mirror());
@@ -2146,7 +2146,7 @@ JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAtIfLoaded(JNIEnv *env, jobject obj, j
21462146
bounds_check(cp, index, CHECK_NULL);
21472147
constantTag tag = cp->tag_at(index);
21482148
if (!tag.is_klass() && !tag.is_unresolved_klass()) {
2149-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2149+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
21502150
}
21512151
Klass* k = ConstantPool::klass_at_if_loaded(cp, index);
21522152
if (k == nullptr) return nullptr;
@@ -2157,7 +2157,7 @@ JVM_END
21572157
static jobject get_method_at_helper(const constantPoolHandle& cp, jint index, bool force_resolution, TRAPS) {
21582158
constantTag tag = cp->tag_at(index);
21592159
if (!tag.is_method() && !tag.is_interface_method()) {
2160-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2160+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
21612161
}
21622162
int klass_ref = cp->uncached_klass_ref_index_at(index);
21632163
Klass* k_o;
@@ -2172,7 +2172,7 @@ static jobject get_method_at_helper(const constantPoolHandle& cp, jint index, bo
21722172
Symbol* sig = cp->uncached_signature_ref_at(index);
21732173
methodHandle m (THREAD, k->find_method(name, sig));
21742174
if (m.is_null()) {
2175-
THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "Unable to look up method in target class");
2175+
THROW_MSG_NULL(vmSymbols::java_lang_RuntimeException(), "Unable to look up method in target class");
21762176
}
21772177
oop method;
21782178
if (!m->is_initializer() || m->is_static()) {
@@ -2206,7 +2206,7 @@ JVM_END
22062206
static jobject get_field_at_helper(constantPoolHandle cp, jint index, bool force_resolution, TRAPS) {
22072207
constantTag tag = cp->tag_at(index);
22082208
if (!tag.is_field()) {
2209-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2209+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
22102210
}
22112211
int klass_ref = cp->uncached_klass_ref_index_at(index);
22122212
Klass* k_o;
@@ -2222,7 +2222,7 @@ static jobject get_field_at_helper(constantPoolHandle cp, jint index, bool force
22222222
fieldDescriptor fd;
22232223
Klass* target_klass = k->find_field(name, sig, &fd);
22242224
if (target_klass == nullptr) {
2225-
THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "Unable to look up field in target class");
2225+
THROW_MSG_NULL(vmSymbols::java_lang_RuntimeException(), "Unable to look up field in target class");
22262226
}
22272227
oop field = Reflection::new_field(&fd, CHECK_NULL);
22282228
return JNIHandles::make_local(THREAD, field);
@@ -2255,7 +2255,7 @@ JVM_ENTRY(jobjectArray, JVM_ConstantPoolGetMemberRefInfoAt(JNIEnv *env, jobject
22552255
bounds_check(cp, index, CHECK_NULL);
22562256
constantTag tag = cp->tag_at(index);
22572257
if (!tag.is_field_or_method()) {
2258-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2258+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
22592259
}
22602260
int klass_ref = cp->uncached_klass_ref_index_at(index);
22612261
Symbol* klass_name = cp->klass_name_at(klass_ref);
@@ -2306,7 +2306,7 @@ JVM_ENTRY(jobjectArray, JVM_ConstantPoolGetNameAndTypeRefInfoAt(JNIEnv *env, job
23062306
bounds_check(cp, index, CHECK_NULL);
23072307
constantTag tag = cp->tag_at(index);
23082308
if (!tag.is_name_and_type()) {
2309-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2309+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
23102310
}
23112311
Symbol* member_name = cp->symbol_at(cp->name_ref_index_at(index));
23122312
Symbol* member_sig = cp->symbol_at(cp->signature_ref_index_at(index));
@@ -2374,7 +2374,7 @@ JVM_ENTRY(jstring, JVM_ConstantPoolGetStringAt(JNIEnv *env, jobject obj, jobject
23742374
bounds_check(cp, index, CHECK_NULL);
23752375
constantTag tag = cp->tag_at(index);
23762376
if (!tag.is_string()) {
2377-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2377+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
23782378
}
23792379
oop str = cp->string_at(index, CHECK_NULL);
23802380
return (jstring) JNIHandles::make_local(THREAD, str);
@@ -2388,7 +2388,7 @@ JVM_ENTRY(jstring, JVM_ConstantPoolGetUTF8At(JNIEnv *env, jobject obj, jobject u
23882388
bounds_check(cp, index, CHECK_NULL);
23892389
constantTag tag = cp->tag_at(index);
23902390
if (!tag.is_symbol()) {
2391-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
2391+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
23922392
}
23932393
Symbol* sym = cp->symbol_at(index);
23942394
Handle str = java_lang_String::create_from_symbol(sym, CHECK_NULL);
@@ -3292,13 +3292,13 @@ JVM_END
32923292
// resolve array handle and check arguments
32933293
static inline arrayOop check_array(JNIEnv *env, jobject arr, bool type_array_only, TRAPS) {
32943294
if (arr == nullptr) {
3295-
THROW_0(vmSymbols::java_lang_NullPointerException());
3295+
THROW_NULL(vmSymbols::java_lang_NullPointerException());
32963296
}
32973297
oop a = JNIHandles::resolve_non_null(arr);
32983298
if (!a->is_array()) {
3299-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array");
3299+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array");
33003300
} else if (type_array_only && !a->is_typeArray()) {
3301-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array of primitive type");
3301+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array of primitive type");
33023302
}
33033303
return arrayOop(a);
33043304
}
@@ -3535,7 +3535,7 @@ JVM_ENTRY(jobject, JVM_InvokeMethod(JNIEnv *env, jobject method, jobject obj, jo
35353535
}
35363536
return res;
35373537
} else {
3538-
THROW_0(vmSymbols::java_lang_StackOverflowError());
3538+
THROW_NULL(vmSymbols::java_lang_StackOverflowError());
35393539
}
35403540
JVM_END
35413541

‎src/hotspot/share/prims/nativeLookup.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2024, 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
@@ -414,7 +414,7 @@ address NativeLookup::lookup_base(const methodHandle& method, TRAPS) {
414414
ss.print("'");
415415
method->print_external_name(&ss);
416416
ss.print("'");
417-
THROW_MSG_0(vmSymbols::java_lang_UnsatisfiedLinkError(), ss.as_string());
417+
THROW_MSG_NULL(vmSymbols::java_lang_UnsatisfiedLinkError(), ss.as_string());
418418
}
419419

420420

‎src/hotspot/share/prims/perf.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static char* jstr_to_utf(JNIEnv *env, jstring str, TRAPS) {
5050
char* utfstr = nullptr;
5151

5252
if (str == nullptr) {
53-
THROW_0(vmSymbols::java_lang_NullPointerException());
53+
THROW_NULL(vmSymbols::java_lang_NullPointerException());
5454
//throw_new(env,"NullPointerException");
5555
}
5656

@@ -113,7 +113,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
113113

114114
if (units <= 0 || units > PerfData::U_Last) {
115115
debug_only(warning("unexpected units argument, units = %d", units));
116-
THROW_0(vmSymbols::java_lang_IllegalArgumentException());
116+
THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
117117
}
118118

119119
ResourceMark rm;
@@ -128,7 +128,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
128128

129129
// check that the PerfData name doesn't already exist
130130
if (PerfDataManager::exists(name_utf)) {
131-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "PerfLong name already exists");
131+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "PerfLong name already exists");
132132
}
133133

134134
switch(variability) {
@@ -152,7 +152,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
152152

153153
default: /* Illegal Argument */
154154
debug_only(warning("unexpected variability value: %d", variability));
155-
THROW_0(vmSymbols::java_lang_IllegalArgumentException());
155+
THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
156156
break;
157157
}
158158

@@ -174,21 +174,21 @@ PERF_ENTRY(jobject, Perf_CreateByteArray(JNIEnv *env, jobject perf,
174174

175175
// check for valid byte array objects
176176
if (name == nullptr || value == nullptr) {
177-
THROW_0(vmSymbols::java_lang_NullPointerException());
177+
THROW_NULL(vmSymbols::java_lang_NullPointerException());
178178
}
179179

180180
// check for valid variability classification
181181
if (variability != PerfData::V_Constant &&
182182
variability != PerfData::V_Variable) {
183183
debug_only(warning("unexpected variability value: %d", variability));
184-
THROW_0(vmSymbols::java_lang_IllegalArgumentException());
184+
THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
185185
}
186186

187187
// check for valid units
188188
if (units != PerfData::U_String) {
189189
// only String based ByteArray objects are currently supported
190190
debug_only(warning("unexpected units value: %d", variability));
191-
THROW_0(vmSymbols::java_lang_IllegalArgumentException());
191+
THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
192192
}
193193

194194
int value_length;
@@ -211,7 +211,7 @@ PERF_ENTRY(jobject, Perf_CreateByteArray(JNIEnv *env, jobject perf,
211211

212212
// check that the counter name doesn't already exist
213213
if (PerfDataManager::exists((char*)name_utf)) {
214-
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "PerfByteArray name already exists");
214+
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "PerfByteArray name already exists");
215215
}
216216

217217
PerfByteArray* pbv = nullptr;

‎src/hotspot/share/prims/unsafe.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ UNSAFE_ENTRY(jobject, Unsafe_StaticFieldBase0(JNIEnv *env, jobject unsafe, jobje
552552
int modifiers = java_lang_reflect_Field::modifiers(reflected);
553553

554554
if ((modifiers & JVM_ACC_STATIC) == 0) {
555-
THROW_0(vmSymbols::java_lang_IllegalArgumentException());
555+
THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
556556
}
557557

558558
return JNIHandles::make_local(THREAD, mirror);

‎src/hotspot/share/prims/whitebox.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ WB_ENTRY(jobject, WB_G1AuxiliaryMemoryUsage(JNIEnv* env))
590590
Handle h = MemoryService::create_MemoryUsage_obj(usage, CHECK_NULL);
591591
return JNIHandles::make_local(THREAD, h());
592592
}
593-
THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
593+
THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
594594
WB_END
595595

596596
WB_ENTRY(jint, WB_G1ActiveMemoryNodeCount(JNIEnv* env, jobject o))

0 commit comments

Comments
 (0)