jdk-sandbox: comparison src/hotspot/share/oops/constantPool.cpp

equal deleted inserted replaced

-:5b78f051912b
+:a535ba736cab
 int ConstantPool::impl_name_and_type_ref_index_at(int which, bool uncached) {
 int i = which;
 if (!uncached && cache() != NULL) {
 if (ConstantPool::is_invokedynamic_index(which)) {
 // Invokedynamic index is index into the constant pool cache
-int pool_index = invokedynamic_cp_cache_entry_at(which)->constant_pool_index();
+int pool_index = invokedynamic_bootstrap_ref_index_at(which);
-pool_index = invoke_dynamic_name_and_type_ref_index_at(pool_index);
+pool_index = bootstrap_name_and_type_ref_index_at(pool_index);
 assert(tag_at(pool_index).is_name_and_type(), "");
 return pool_index;
 }
 // change byte-ordering and go via cache
 i = remap_instruction_operand_from_cache(which);
 } else {
-if (tag_at(which).is_invoke_dynamic() ||
+if (tag_at(which).has_bootstrap()) {
-tag_at(which).is_dynamic_constant() ||
+int pool_index = bootstrap_name_and_type_ref_index_at(which);
-tag_at(which).is_dynamic_constant_in_error()) {
-int pool_index = invoke_dynamic_name_and_type_ref_index_at(which);
 assert(tag_at(pool_index).is_name_and_type(), "");
 return pool_index;
 }
 }
 assert(tag_at(i).is_field_or_method(), "Corrupted constant pool");
-assert(!tag_at(i).is_invoke_dynamic() &&
+assert(!tag_at(i).has_bootstrap(), "Must be handled above");
-!tag_at(i).is_dynamic_constant() &&
-!tag_at(i).is_dynamic_constant_in_error(), "Must be handled above");
 jint ref_index = *int_at_addr(i);
 return extract_high_short_from_int(ref_index);
 }
 constantTag ConstantPool::impl_tag_ref_at(int which, bool uncached) {
 int pool_index = which;
 if (!uncached && cache() != NULL) {
 if (ConstantPool::is_invokedynamic_index(which)) {
 // Invokedynamic index is index into resolved_references
-pool_index = invokedynamic_cp_cache_entry_at(which)->constant_pool_index();
+pool_index = invokedynamic_bootstrap_ref_index_at(which);
 } else {
 // change byte-ordering and go via cache
 pool_index = remap_instruction_operand_from_cache(which);
 }
 }
 {
 // JVM_CONSTANT_InvokeDynamic is an ordered pair of [bootm, name&mtype], plus optional arguments
 // JVM_CONSTANT_Dynamic is an ordered pair of [bootm, name&ftype], plus optional arguments
 // In both cases, the bootm, being a JVM_CONSTANT_MethodHandle, has its own cache entry.
 // It is accompanied by the optional arguments.
-int bsm_index = this_cp->invoke_dynamic_bootstrap_method_ref_index_at(index);
+int bsm_index = this_cp->bootstrap_method_ref_index_at(index);
 oop bsm_oop = this_cp->resolve_possibly_cached_constant_at(bsm_index, CHECK_NULL);
 if (!java_lang_invoke_MethodHandle::is_instance(bsm_oop)) {
 THROW_MSG_NULL(vmSymbols::java_lang_LinkageError(), "BSM not an MethodHandle");
 }
 // Extract the optional static arguments.
-argc = this_cp->invoke_dynamic_argument_count_at(index);
+argc = this_cp->bootstrap_argument_count_at(index);
 // if there are no static arguments, return the bsm by itself:
 if (argc == 0 && UseBootstrapCallInfo < 2)  return bsm_oop;
 bsm = Handle(THREAD, bsm_oop);
 // because Java has stack overflow checking, so we punt
 // potentially cyclic cases from C to Java.
 if (!use_BSCI && this_cp->tag_at(index).is_dynamic_constant()) {
 bool found_unresolved_condy = false;
 for (int i = 0; i < argc; i++) {
-int arg_index = this_cp->invoke_dynamic_argument_index_at(index, i);
+int arg_index = this_cp->bootstrap_argument_index_at(index, i);
 if (this_cp->tag_at(arg_index).is_dynamic_constant()) {
 // potential recursion point condy -> condy
 bool found_it = false;
 this_cp->find_cached_constant_at(arg_index, found_it, CHECK_NULL);
 if (!found_it) { found_unresolved_condy = true; break; }
 // push them, instead of asking the JDK runtime to turn around and
 // pull them, saving a JVM/JDK transition in some simple cases.
 bool all_resolved = true;
 for (int i = 0; i < argc; i++) {
 bool found_it = false;
-int arg_index = this_cp->invoke_dynamic_argument_index_at(index, i);
+int arg_index = this_cp->bootstrap_argument_index_at(index, i);
 this_cp->find_cached_constant_at(arg_index, found_it, CHECK_NULL);
 if (!found_it) { all_resolved = false; break; }
 }
 if (all_resolved)
 use_BSCI = false;
 // info array non-null, pos..limit in [0..info.length]
 if ((0 >= index    || index >= this_cp->length())  ||
 !(this_cp->tag_at(index).is_invoke_dynamic()    ||
 this_cp->tag_at(index).is_dynamic_constant()) ||
 (0 > start_arg || start_arg > end_arg) ||
-(end_arg > (argc = this_cp->invoke_dynamic_argument_count_at(index))) ||
+(end_arg > (argc = this_cp->bootstrap_argument_count_at(index))) ||
 (0 > pos       || pos > limit)         ||
 (info.is_null() || limit > info->length())) {
 // An index or something else went wrong; throw an error.
 // Since this is an internal API, we don't expect this,
 // so we don't bother to craft a nice message.
 THROW_MSG(vmSymbols::java_lang_LinkageError(), "bad BSM argument access");
 }
 // now we can loop safely
 int info_i = pos;
 for (int i = start_arg; i < end_arg; i++) {
-int arg_index = this_cp->invoke_dynamic_argument_index_at(index, i);
+int arg_index = this_cp->bootstrap_argument_index_at(index, i);
 oop arg_oop;
 if (must_resolve) {
 arg_oop = this_cp->resolve_possibly_cached_constant_at(arg_index, CHECK);
 } else {
 bool found_it = false;
 }
 } break;
 case JVM_CONSTANT_Dynamic:
 {
-int k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
+int k1 = bootstrap_name_and_type_ref_index_at(index1);
-int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
+int k2 = cp2->bootstrap_name_and_type_ref_index_at(index2);
-int i1 = invoke_dynamic_bootstrap_specifier_index(index1);
+int i1 = bootstrap_methods_attribute_index(index1);
-int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2);
+int i2 = cp2->bootstrap_methods_attribute_index(index2);
 // separate statements and variables because CHECK_false is used
 bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false);
 bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false);
 return (match_entry && match_operand);
 } break;
 case JVM_CONSTANT_InvokeDynamic:
 {
-int k1 = invoke_dynamic_name_and_type_ref_index_at(index1);
+int k1 = bootstrap_name_and_type_ref_index_at(index1);
-int k2 = cp2->invoke_dynamic_name_and_type_ref_index_at(index2);
+int k2 = cp2->bootstrap_name_and_type_ref_index_at(index2);
-int i1 = invoke_dynamic_bootstrap_specifier_index(index1);
+int i1 = bootstrap_methods_attribute_index(index1);
-int i2 = cp2->invoke_dynamic_bootstrap_specifier_index(index2);
+int i2 = cp2->bootstrap_methods_attribute_index(index2);
 // separate statements and variables because CHECK_false is used
 bool match_entry = compare_entry_to(k1, cp2, k2, CHECK_false);
 bool match_operand = compare_operand_to(i1, cp2, i2, CHECK_false);
 return (match_entry && match_operand);
 } break;
 } break;
 case JVM_CONSTANT_Dynamic:
 case JVM_CONSTANT_DynamicInError:
 {
-int k1 = from_cp->invoke_dynamic_bootstrap_specifier_index(from_i);
+int k1 = from_cp->bootstrap_methods_attribute_index(from_i);
-int k2 = from_cp->invoke_dynamic_name_and_type_ref_index_at(from_i);
+int k2 = from_cp->bootstrap_name_and_type_ref_index_at(from_i);
 k1 += operand_array_length(to_cp->operands());  // to_cp might already have operands
 to_cp->dynamic_constant_at_put(to_i, k1, k2);
 } break;
 case JVM_CONSTANT_InvokeDynamic:
 {
-int k1 = from_cp->invoke_dynamic_bootstrap_specifier_index(from_i);
+int k1 = from_cp->bootstrap_methods_attribute_index(from_i);
-int k2 = from_cp->invoke_dynamic_name_and_type_ref_index_at(from_i);
+int k2 = from_cp->bootstrap_name_and_type_ref_index_at(from_i);
 k1 += operand_array_length(to_cp->operands());  // to_cp might already have operands
 to_cp->invoke_dynamic_at_put(to_i, k1, k2);
 } break;
 // Invalid is used as the tag for the second constant pool entry
 case JVM_CONSTANT_Dynamic:
 case JVM_CONSTANT_DynamicInError: {
 *bytes = tag;
 idx1 = extract_low_short_from_int(*int_at_addr(idx));
 idx2 = extract_high_short_from_int(*int_at_addr(idx));
-assert(idx2 == invoke_dynamic_name_and_type_ref_index_at(idx), "correct half of u4");
+assert(idx2 == bootstrap_name_and_type_ref_index_at(idx), "correct half of u4");
 Bytes::put_Java_u2((address) (bytes+1), idx1);
 Bytes::put_Java_u2((address) (bytes+3), idx2);
 DBG(printf("JVM_CONSTANT_Dynamic: %hd %hd", idx1, idx2));
 break;
 }
 case JVM_CONSTANT_InvokeDynamic: {
 *bytes = tag;
 idx1 = extract_low_short_from_int(*int_at_addr(idx));
 idx2 = extract_high_short_from_int(*int_at_addr(idx));
-assert(idx2 == invoke_dynamic_name_and_type_ref_index_at(idx), "correct half of u4");
+assert(idx2 == bootstrap_name_and_type_ref_index_at(idx), "correct half of u4");
 Bytes::put_Java_u2((address) (bytes+1), idx1);
 Bytes::put_Java_u2((address) (bytes+3), idx2);
 DBG(printf("JVM_CONSTANT_InvokeDynamic: %hd %hd", idx1, idx2));
 break;
 }
 st->print("signature_index=%d", method_type_index_at(index));
 break;
 case JVM_CONSTANT_Dynamic :
 case JVM_CONSTANT_DynamicInError :
 {
-st->print("bootstrap_method_index=%d", invoke_dynamic_bootstrap_method_ref_index_at(index));
+st->print("bootstrap_method_index=%d", bootstrap_method_ref_index_at(index));
-st->print(" type_index=%d", invoke_dynamic_name_and_type_ref_index_at(index));
+st->print(" type_index=%d", bootstrap_name_and_type_ref_index_at(index));
-int argc = invoke_dynamic_argument_count_at(index);
+int argc = bootstrap_argument_count_at(index);
 if (argc > 0) {
 for (int arg_i = 0; arg_i < argc; arg_i++) {
-int arg = invoke_dynamic_argument_index_at(index, arg_i);
+int arg = bootstrap_argument_index_at(index, arg_i);
 st->print((arg_i == 0 ? " arguments={%d" : ", %d"), arg);
 }
 st->print("}");
 }
 }
 break;
 case JVM_CONSTANT_InvokeDynamic :
 {
-st->print("bootstrap_method_index=%d", invoke_dynamic_bootstrap_method_ref_index_at(index));
+st->print("bootstrap_method_index=%d", bootstrap_method_ref_index_at(index));
-st->print(" name_and_type_index=%d", invoke_dynamic_name_and_type_ref_index_at(index));
+st->print(" name_and_type_index=%d", bootstrap_name_and_type_ref_index_at(index));
-int argc = invoke_dynamic_argument_count_at(index);
+int argc = bootstrap_argument_count_at(index);
 if (argc > 0) {
 for (int arg_i = 0; arg_i < argc; arg_i++) {
-int arg = invoke_dynamic_argument_index_at(index, arg_i);
+int arg = bootstrap_argument_index_at(index, arg_i);
 st->print((arg_i == 0 ? " arguments={%d" : ", %d"), arg);
 }
 st->print("}");
 }
 }

changeset 53745	a535ba736cab
parent 53590	ce36f8180d03
child 53746	bdccafc038a2