Skip to content

Commit 5d7e93c

Browse files
coleenpcoleenp
committedMar 24, 2021
8264004: Don't use TRAPS if no exceptions are thrown
Reviewed-by: dholmes, iklam, hseigel, dcubed
·
JEP-429-branchpoint
1 parent 9ee0b9a commit 5d7e93c

File tree

4 files changed

+168
-202
lines changed

4 files changed

+168
-202
lines changed
 

‎src/hotspot/share/oops/constantPool.cpp

+24-34
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ void ConstantPool::unreference_symbols() {
12681268
// Compare this constant pool's entry at index1 to the constant pool
12691269
// cp2's entry at index2.
12701270
bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
1271-
int index2, TRAPS) {
1271+
int index2) {
12721272

12731273
// The error tags are equivalent to non-error tags when comparing
12741274
jbyte t1 = tag_at(index1).non_error_value();
@@ -1287,8 +1287,8 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
12871287
switch (t1) {
12881288
case JVM_CONSTANT_Class:
12891289
{
1290-
Klass* k1 = klass_at(index1, CHECK_false);
1291-
Klass* k2 = cp2->klass_at(index2, CHECK_false);
1290+
Klass* k1 = resolved_klass_at(index1);
1291+
Klass* k2 = cp2->resolved_klass_at(index2);
12921292
if (k1 == k2) {
12931293
return true;
12941294
}
@@ -1298,8 +1298,7 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
12981298
{
12991299
int recur1 = klass_index_at(index1);
13001300
int recur2 = cp2->klass_index_at(index2);
1301-
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1302-
if (match) {
1301+
if (compare_entry_to(recur1, cp2, recur2)) {
13031302
return true;
13041303
}
13051304
} break;
@@ -1319,12 +1318,11 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
13191318
{
13201319
int recur1 = uncached_klass_ref_index_at(index1);
13211320
int recur2 = cp2->uncached_klass_ref_index_at(index2);
1322-
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1321+
bool match = compare_entry_to(recur1, cp2, recur2);
13231322
if (match) {
13241323
recur1 = uncached_name_and_type_ref_index_at(index1);
13251324
recur2 = cp2->uncached_name_and_type_ref_index_at(index2);
1326-
match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1327-
if (match) {
1325+
if (compare_entry_to(recur1, cp2, recur2)) {
13281326
return true;
13291327
}
13301328
}
@@ -1361,12 +1359,10 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
13611359
{
13621360
int recur1 = name_ref_index_at(index1);
13631361
int recur2 = cp2->name_ref_index_at(index2);
1364-
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1365-
if (match) {
1362+
if (compare_entry_to(recur1, cp2, recur2)) {
13661363
recur1 = signature_ref_index_at(index1);
13671364
recur2 = cp2->signature_ref_index_at(index2);
1368-
match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1369-
if (match) {
1365+
if (compare_entry_to(recur1, cp2, recur2)) {
13701366
return true;
13711367
}
13721368
}
@@ -1376,8 +1372,7 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
13761372
{
13771373
int recur1 = string_index_at(index1);
13781374
int recur2 = cp2->string_index_at(index2);
1379-
bool match = compare_entry_to(recur1, cp2, recur2, CHECK_false);
1380-
if (match) {
1375+
if (compare_entry_to(recur1, cp2, recur2)) {
13811376
return true;
13821377
}
13831378
} break;
@@ -1395,8 +1390,7 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
13951390
{
13961391
int k1 = method_type_index_at(index1);
13971392
int k2 = cp2->method_type_index_at(index2);
1398-
bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
1399-
if (match) {
1393+
if (compare_entry_to(k1, cp2, k2)) {
14001394
return true;
14011395
}
14021396
} break;
@@ -1408,8 +1402,7 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
14081402
if (k1 == k2) {
14091403
int i1 = method_handle_index_at(index1);
14101404
int i2 = cp2->method_handle_index_at(index2);
1411-
bool match = compare_entry_to(i1, cp2, i2, CHECK_false);
1412-
if (match) {
1405+
if (compare_entry_to(i1, cp2, i2)) {
14131406
return true;
14141407
}
14151408
}
@@ -1421,9 +1414,8 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
14211414
int k2 = cp2->bootstrap_name_and_type_ref_index_at(index2);
14221415
int i1 = bootstrap_methods_attribute_index(index1);
14231416
int i2 = cp2->bootstrap_methods_attribute_index(index2);
1424-
// separate statements and variables because CHECK_false is used
1425-
bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false);
1426-
bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false);
1417+
bool match_entry = compare_entry_to(k1, cp2, k2);
1418+
bool match_operand = compare_operand_to(i1, cp2, i2);
14271419
return (match_entry && match_operand);
14281420
} break;
14291421

@@ -1433,9 +1425,8 @@ bool ConstantPool::compare_entry_to(int index1, const constantPoolHandle& cp2,
14331425
int k2 = cp2->bootstrap_name_and_type_ref_index_at(index2);
14341426
int i1 = bootstrap_methods_attribute_index(index1);
14351427
int i2 = cp2->bootstrap_methods_attribute_index(index2);
1436-
// separate statements and variables because CHECK_false is used
1437-
bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false);
1438-
bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false);
1428+
bool match_entry = compare_entry_to(k1, cp2, k2);
1429+
bool match_operand = compare_operand_to(i1, cp2, i2);
14391430
return (match_entry && match_operand);
14401431
} break;
14411432

@@ -1616,7 +1607,7 @@ void ConstantPool::copy_cp_to_impl(const constantPoolHandle& from_cp, int start_
16161607
int dest_i = to_i; // leave original alone for debug purposes
16171608

16181609
for (int src_i = start_i; src_i <= end_i; /* see loop bottom */ ) {
1619-
copy_entry_to(from_cp, src_i, to_cp, dest_i, CHECK);
1610+
copy_entry_to(from_cp, src_i, to_cp, dest_i);
16201611

16211612
switch (from_cp->tag_at(src_i).value()) {
16221613
case JVM_CONSTANT_Double:
@@ -1641,8 +1632,7 @@ void ConstantPool::copy_cp_to_impl(const constantPoolHandle& from_cp, int start_
16411632
// Copy this constant pool's entry at from_i to the constant pool
16421633
// to_cp's entry at to_i.
16431634
void ConstantPool::copy_entry_to(const constantPoolHandle& from_cp, int from_i,
1644-
const constantPoolHandle& to_cp, int to_i,
1645-
TRAPS) {
1635+
const constantPoolHandle& to_cp, int to_i) {
16461636

16471637
int tag = from_cp->tag_at(from_i).value();
16481638
switch (tag) {
@@ -1786,11 +1776,11 @@ void ConstantPool::copy_entry_to(const constantPoolHandle& from_cp, int from_i,
17861776
// constant pool's entry at pattern_i. Returns the index of a
17871777
// matching entry or zero (0) if there is no matching entry.
17881778
int ConstantPool::find_matching_entry(int pattern_i,
1789-
const constantPoolHandle& search_cp, TRAPS) {
1779+
const constantPoolHandle& search_cp) {
17901780

17911781
// index zero (0) is not used
17921782
for (int i = 1; i < search_cp->length(); i++) {
1793-
bool found = compare_entry_to(pattern_i, search_cp, i, CHECK_0);
1783+
bool found = compare_entry_to(pattern_i, search_cp, i);
17941784
if (found) {
17951785
return i;
17961786
}
@@ -1802,10 +1792,10 @@ int ConstantPool::find_matching_entry(int pattern_i,
18021792

18031793
// Compare this constant pool's bootstrap specifier at idx1 to the constant pool
18041794
// cp2's bootstrap specifier at idx2.
1805-
bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, int idx2, TRAPS) {
1795+
bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, int idx2) {
18061796
int k1 = operand_bootstrap_method_ref_index_at(idx1);
18071797
int k2 = cp2->operand_bootstrap_method_ref_index_at(idx2);
1808-
bool match = compare_entry_to(k1, cp2, k2, CHECK_false);
1798+
bool match = compare_entry_to(k1, cp2, k2);
18091799

18101800
if (!match) {
18111801
return false;
@@ -1815,7 +1805,7 @@ bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, i
18151805
for (int j = 0; j < argc; j++) {
18161806
k1 = operand_argument_index_at(idx1, j);
18171807
k2 = cp2->operand_argument_index_at(idx2, j);
1818-
match = compare_entry_to(k1, cp2, k2, CHECK_false);
1808+
match = compare_entry_to(k1, cp2, k2);
18191809
if (!match) {
18201810
return false;
18211811
}
@@ -1829,9 +1819,9 @@ bool ConstantPool::compare_operand_to(int idx1, const constantPoolHandle& cp2, i
18291819
// this constant pool's bootstrap specifier data at pattern_i index.
18301820
// Return the index of a matching bootstrap attribute record or (-1) if there is no match.
18311821
int ConstantPool::find_matching_operand(int pattern_i,
1832-
const constantPoolHandle& search_cp, int search_len, TRAPS) {
1822+
const constantPoolHandle& search_cp, int search_len) {
18331823
for (int i = 0; i < search_len; i++) {
1834-
bool found = compare_operand_to(pattern_i, search_cp, i, CHECK_(-1));
1824+
bool found = compare_operand_to(pattern_i, search_cp, i);
18351825
if (found) {
18361826
return i;
18371827
}

‎src/hotspot/share/oops/constantPool.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,10 @@ class ConstantPool : public Metadata {
660660
}
661661
// Compare a bootstrap specifier data in the operands arrays
662662
bool compare_operand_to(int bsms_attribute_index1, const constantPoolHandle& cp2,
663-
int bsms_attribute_index2, TRAPS);
663+
int bsms_attribute_index2);
664664
// Find a bootstrap specifier data in the operands array
665665
int find_matching_operand(int bsms_attribute_index, const constantPoolHandle& search_cp,
666-
int operands_cur_len, TRAPS);
666+
int operands_cur_len);
667667
// Resize the operands array with delta_len and delta_size
668668
void resize_operands(int delta_len, int delta_size, TRAPS);
669669
// Extend the operands array with the length and size of the ext_cp operands
@@ -903,15 +903,15 @@ class ConstantPool : public Metadata {
903903
static void throw_resolution_error(const constantPoolHandle& this_cp, int which, TRAPS);
904904

905905
// Merging ConstantPool* support:
906-
bool compare_entry_to(int index1, const constantPoolHandle& cp2, int index2, TRAPS);
906+
bool compare_entry_to(int index1, const constantPoolHandle& cp2, int index2);
907907
void copy_cp_to(int start_i, int end_i, const constantPoolHandle& to_cp, int to_i, TRAPS) {
908908
constantPoolHandle h_this(THREAD, this);
909909
copy_cp_to_impl(h_this, start_i, end_i, to_cp, to_i, THREAD);
910910
}
911911
static void copy_cp_to_impl(const constantPoolHandle& from_cp, int start_i, int end_i, const constantPoolHandle& to_cp, int to_i, TRAPS);
912-
static void copy_entry_to(const constantPoolHandle& from_cp, int from_i, const constantPoolHandle& to_cp, int to_i, TRAPS);
912+
static void copy_entry_to(const constantPoolHandle& from_cp, int from_i, const constantPoolHandle& to_cp, int to_i);
913913
static void copy_operands(const constantPoolHandle& from_cp, const constantPoolHandle& to_cp, TRAPS);
914-
int find_matching_entry(int pattern_i, const constantPoolHandle& search_cp, TRAPS);
914+
int find_matching_entry(int pattern_i, const constantPoolHandle& search_cp);
915915
int version() const { return _saved._version; }
916916
void set_version(int version) { _saved._version = version; }
917917
void increment_and_save_version(int version) {

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

+109-128
Large diffs are not rendered by default.

‎src/hotspot/share/prims/jvmtiRedefineClasses.hpp

+30-35
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ class VM_RedefineClasses: public VM_Operation {
400400
// Constant pool merging work is done here as needed. Also calls
401401
// compare_and_normalize_class_versions() to verify the class
402402
// definition(s).
403-
jvmtiError load_new_class_versions(TRAPS);
403+
jvmtiError load_new_class_versions();
404404

405405
// Verify that the caller provided class definition(s) that meet
406406
// the restrictions of RedefineClasses. Normalize the order of
@@ -429,18 +429,18 @@ class VM_RedefineClasses: public VM_Operation {
429429

430430
// Increment the classRedefinedCount field in the specific InstanceKlass
431431
// and in all direct and indirect subclasses.
432-
void increment_class_counter(InstanceKlass *ik, TRAPS);
432+
void increment_class_counter(InstanceKlass *ik);
433433

434434
// Support for constant pool merging (these routines are in alpha order):
435435
void append_entry(const constantPoolHandle& scratch_cp, int scratch_i,
436-
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
436+
constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
437437
void append_operand(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
438-
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
438+
constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
439439
void finalize_operands_merge(const constantPoolHandle& merge_cp, TRAPS);
440440
int find_or_append_indirect_entry(const constantPoolHandle& scratch_cp, int scratch_i,
441-
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
441+
constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
442442
int find_or_append_operand(const constantPoolHandle& scratch_cp, int scratch_bootstrap_spec_index,
443-
constantPoolHandle *merge_cp_p, int *merge_cp_length_p, TRAPS);
443+
constantPoolHandle *merge_cp_p, int *merge_cp_length_p);
444444
int find_new_index(int old_index);
445445
int find_new_operand_index(int old_bootstrap_spec_index);
446446
bool is_unresolved_class_mismatch(const constantPoolHandle& cp1, int index1,
@@ -454,51 +454,46 @@ class VM_RedefineClasses: public VM_Operation {
454454
InstanceKlass* scratch_class, TRAPS);
455455
u2 rewrite_cp_ref_in_annotation_data(
456456
AnnotationArray* annotations_typeArray, int &byte_i_ref,
457-
const char * trace_mesg, TRAPS);
458-
bool rewrite_cp_refs(InstanceKlass* scratch_class, TRAPS);
457+
const char * trace_mesg);
458+
bool rewrite_cp_refs(InstanceKlass* scratch_class);
459459
bool rewrite_cp_refs_in_annotation_struct(
460-
AnnotationArray* class_annotations, int &byte_i_ref, TRAPS);
460+
AnnotationArray* class_annotations, int &byte_i_ref);
461461
bool rewrite_cp_refs_in_annotations_typeArray(
462-
AnnotationArray* annotations_typeArray, int &byte_i_ref, TRAPS);
463-
bool rewrite_cp_refs_in_class_annotations(
464-
InstanceKlass* scratch_class, TRAPS);
462+
AnnotationArray* annotations_typeArray, int &byte_i_ref);
463+
bool rewrite_cp_refs_in_class_annotations(InstanceKlass* scratch_class);
465464
bool rewrite_cp_refs_in_element_value(
466-
AnnotationArray* class_annotations, int &byte_i_ref, TRAPS);
465+
AnnotationArray* class_annotations, int &byte_i_ref);
467466
bool rewrite_cp_refs_in_type_annotations_typeArray(
468467
AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
469-
const char * location_mesg, TRAPS);
468+
const char * location_mesg);
470469
bool rewrite_cp_refs_in_type_annotation_struct(
471470
AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
472-
const char * location_mesg, TRAPS);
471+
const char * location_mesg);
473472
bool skip_type_annotation_target(
474473
AnnotationArray* type_annotations_typeArray, int &byte_i_ref,
475-
const char * location_mesg, TRAPS);
474+
const char * location_mesg);
476475
bool skip_type_annotation_type_path(
477-
AnnotationArray* type_annotations_typeArray, int &byte_i_ref, TRAPS);
478-
bool rewrite_cp_refs_in_fields_annotations(
479-
InstanceKlass* scratch_class, TRAPS);
476+
AnnotationArray* type_annotations_typeArray, int &byte_i_ref);
477+
bool rewrite_cp_refs_in_fields_annotations(InstanceKlass* scratch_class);
480478
bool rewrite_cp_refs_in_nest_attributes(InstanceKlass* scratch_class);
481-
bool rewrite_cp_refs_in_record_attribute(InstanceKlass* scratch_class, TRAPS);
479+
bool rewrite_cp_refs_in_record_attribute(InstanceKlass* scratch_class);
482480
bool rewrite_cp_refs_in_permitted_subclasses_attribute(InstanceKlass* scratch_class);
481+
483482
void rewrite_cp_refs_in_method(methodHandle method,
484483
methodHandle * new_method_p, TRAPS);
485-
bool rewrite_cp_refs_in_methods(InstanceKlass* scratch_class, TRAPS);
486-
bool rewrite_cp_refs_in_methods_annotations(
487-
InstanceKlass* scratch_class, TRAPS);
488-
bool rewrite_cp_refs_in_methods_default_annotations(
489-
InstanceKlass* scratch_class, TRAPS);
490-
bool rewrite_cp_refs_in_methods_parameter_annotations(
491-
InstanceKlass* scratch_class, TRAPS);
492-
bool rewrite_cp_refs_in_class_type_annotations(
493-
InstanceKlass* scratch_class, TRAPS);
494-
bool rewrite_cp_refs_in_fields_type_annotations(
495-
InstanceKlass* scratch_class, TRAPS);
496-
bool rewrite_cp_refs_in_methods_type_annotations(
497-
InstanceKlass* scratch_class, TRAPS);
498-
void rewrite_cp_refs_in_stack_map_table(const methodHandle& method, TRAPS);
484+
bool rewrite_cp_refs_in_methods(InstanceKlass* scratch_class);
485+
486+
bool rewrite_cp_refs_in_methods_annotations(InstanceKlass* scratch_class);
487+
bool rewrite_cp_refs_in_methods_default_annotations(InstanceKlass* scratch_class);
488+
bool rewrite_cp_refs_in_methods_parameter_annotations(InstanceKlass* scratch_class);
489+
bool rewrite_cp_refs_in_class_type_annotations(InstanceKlass* scratch_class);
490+
bool rewrite_cp_refs_in_fields_type_annotations(InstanceKlass* scratch_class);
491+
bool rewrite_cp_refs_in_methods_type_annotations(InstanceKlass* scratch_class);
492+
493+
void rewrite_cp_refs_in_stack_map_table(const methodHandle& method);
499494
void rewrite_cp_refs_in_verification_type_info(
500495
address& stackmap_addr_ref, address stackmap_end, u2 frame_i,
501-
u1 frame_size, TRAPS);
496+
u1 frame_size);
502497
void set_new_constant_pool(ClassLoaderData* loader_data,
503498
InstanceKlass* scratch_class,
504499
constantPoolHandle scratch_cp, int scratch_cp_length, TRAPS);

0 commit comments

Comments
 (0)
Please sign in to comment.