< prev index next > src/hotspot/share/classfile/classFileParser.cpp
Print this page
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
+
+ #include "oops/inlineKlass.hpp"
#include "precompiled.hpp"
#include "classfile/classFileParser.hpp"
#include "classfile/classFileStream.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/classLoaderData.inline.hpp"
#include "memory/universe.hpp"
#include "oops/annotations.hpp"
#include "oops/constantPool.inline.hpp"
#include "oops/fieldInfo.hpp"
#include "oops/fieldStreams.inline.hpp"
+ #include "oops/inlineKlass.inline.hpp"
#include "oops/instanceKlass.inline.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/klass.inline.hpp"
#include "oops/klassVtable.hpp"
#include "oops/metadata.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
#include "utilities/resourceHash.hpp"
+ #include "utilities/stringUtils.hpp"
#include "utilities/utf8.hpp"
#if INCLUDE_CDS
#include "classfile/systemDictionaryShared.hpp"
#endif
#if INCLUDE_JFR
#define JAVA_21_VERSION 65
#define JAVA_22_VERSION 66
+ #define CONSTANT_CLASS_DESCRIPTORS 66
+
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
assert((bad_constant == JVM_CONSTANT_Module ||
bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION,
"Unexpected bad constant pool entry");
if (_bad_constant_seen == 0) _bad_constant_seen = bad_constant;
// Each of the following case guarantees one more byte in the stream
// for the following tag or the access_flags following constant pool,
// so we don't need bounds-check for reading tag.
const u1 tag = cfs->get_u1_fast();
switch (tag) {
- case JVM_CONSTANT_Class : {
+ case JVM_CONSTANT_Class: {
cfs->guarantee_more(3, CHECK); // name_index, tag/access_flags
const u2 name_index = cfs->get_u2_fast();
cp->klass_index_at_put(index, name_index);
break;
}
case JVM_CONSTANT_ClassIndex: {
const int class_index = cp->klass_index_at(index);
check_property(valid_symbol_at(class_index),
"Invalid constant pool index %u in class file %s",
class_index, CHECK);
- cp->unresolved_klass_at_put(index, class_index, num_klasses++);
+
+ Symbol* const name = cp->symbol_at(class_index);
+ const unsigned int name_len = name->utf8_length();
+ if (name->is_Q_signature()) {
+ cp->unresolved_qdescriptor_at_put(index, class_index, num_klasses++);
+ } else {
+ cp->unresolved_klass_at_put(index, class_index, num_klasses++);
+ }
break;
}
case JVM_CONSTANT_StringIndex: {
const int string_index = cp->string_index_at(index);
check_property(valid_symbol_at(string_index),
// the right type.
if (!Signature::is_method(signature)) {
throwIllegalSignature("Method", name, signature, CHECK);
}
}
- // If a class method name begins with '<', it must be "<init>" and have void signature.
+ // If a class method name begins with '<', it must be "<init>" and have void signature,
+ // or if it is an inline type, <vnew> with return.
const unsigned int name_len = name->utf8_length();
if (tag == JVM_CONSTANT_Methodref && name_len != 0 &&
name->char_at(0) == JVM_SIGNATURE_SPECIAL) {
- if (name != vmSymbols::object_initializer_name()) {
+ if (name != vmSymbols::object_initializer_name() &&
+ name != vmSymbols::inline_factory_name()) {
classfile_parse_error(
"Bad method name at constant pool index %u in class file %s",
name_ref_index, THREAD);
return;
- } else if (!Signature::is_void_method(signature)) { // must have void signature.
- throwIllegalSignature("Method", name, signature, CHECK);
+ } else if (!Signature::is_void_method(signature)) {
+ // if return type is non-void then it must be an inline type
+ if (name == vmSymbols::object_initializer_name() ||
+ !EnableValhalla || !supports_inline_types() ||
+ !signature->ends_with(JVM_SIGNATURE_ENDCLASS)) {
+ throwIllegalSignature("Method", name, signature, CHECK);
+ }
}
}
}
break;
}
const int name_and_type_ref_index =
cp->uncached_name_and_type_ref_index_at(ref_index);
const int name_ref_index =
cp->name_ref_index_at(name_and_type_ref_index);
const Symbol* const name = cp->symbol_at(name_ref_index);
- if (ref_kind == JVM_REF_newInvokeSpecial) {
- if (name != vmSymbols::object_initializer_name()) {
+
+ if (EnableValhalla && supports_inline_types() && name == vmSymbols::inline_factory_name()) { // <vnew>
+ // <vnew> factory methods must be non-void return and invokeStatic.
+ const int signature_ref_index =
+ cp->signature_ref_index_at(name_and_type_ref_index);
+ const Symbol* const signature = cp->symbol_at(signature_ref_index);
+ if (signature->is_void_method_signature() || ref_kind != JVM_REF_invokeStatic) {
+ classfile_parse_error(
+ "Bad factory method name at constant pool index %u in class file %s",
+ name_ref_index, CHECK);
+ }
+ } else if (name != vmSymbols::object_initializer_name()) { // !<init>
+ if (ref_kind == JVM_REF_newInvokeSpecial) {
classfile_parse_error(
"Bad constructor name at constant pool index %u in class file %s",
name_ref_index, THREAD);
return;
}
- } else {
- if (name == vmSymbols::object_initializer_name()) {
+ } else { // <init>
+ // The allowed invocation mode of <init> depends on its signature.
+ // This test corresponds to verify_invoke_instructions in the verifier.
+ const int signature_ref_index =
+ cp->signature_ref_index_at(name_and_type_ref_index);
+ const Symbol* const signature = cp->symbol_at(signature_ref_index);
+ if (signature->is_void_method_signature()
+ && ref_kind == JVM_REF_newInvokeSpecial) {
+ // OK, could be a constructor call
+ } else {
classfile_parse_error(
"Bad method name at constant pool index %u in class file %s",
name_ref_index, THREAD);
return;
}
using NameSigHashtable = ResourceHashtable<NameSigHash, int,
NameSigHash::HASH_ROW_SIZE,
AnyObj::RESOURCE_AREA, mtInternal,
&NameSigHash::hash, &NameSigHash::equals>;
- // Side-effects: populates the _local_interfaces field
- void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
- const int itfs_len,
- ConstantPool* const cp,
+ static void check_identity_and_value_modifiers(ClassFileParser* current, const InstanceKlass* super_type, TRAPS) {
+ assert(super_type != nullptr,"Method doesn't support null super type");
+ if (super_type->carries_identity_modifier()) {
+ if (current->carries_value_modifier()) {
+ ResourceMark rm(THREAD);
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_IncompatibleClassChangeError(),
+ "Value type %s has an identity type as supertype",
+ current->class_name()->as_klass_external_name());
+ return;
+ }
+ current->set_carries_identity_modifier();
+ }
+ if (super_type->carries_value_modifier()) {
+ if (current->carries_identity_modifier()) {
+ ResourceMark rm(THREAD);
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_IncompatibleClassChangeError(),
+ "Identity type %s has a value type as supertype",
+ current->class_name()->as_klass_external_name());
+ return;
+ }
+ current->set_carries_value_modifier();
+ }
+ }
+
+ void ClassFileParser::parse_interfaces(const ClassFileStream* stream,
+ int itfs_len,
+ ConstantPool* cp,
bool* const has_nonstatic_concrete_methods,
+ // FIXME: lots of these functions
+ // declare their parameters as const,
+ // which adds only noise to the code.
+ // Remove the spurious const modifiers.
+ // Many are of the form "const int x"
+ // or "T* const x".
+ bool* const is_declared_atomic,
TRAPS) {
assert(stream != nullptr, "invariant");
assert(cp != nullptr, "invariant");
assert(has_nonstatic_concrete_methods != nullptr, "invariant");
if (itfs_len == 0) {
_local_interfaces = Universe::the_empty_instance_klass_array();
+
} else {
assert(itfs_len > 0, "only called for len>0");
- _local_interfaces = MetadataFactory::new_array<InstanceKlass*>(_loader_data, itfs_len, nullptr, CHECK);
-
- int index;
+ _local_interface_indexes = new GrowableArray<u2>(itfs_len);
+ int index = 0;
for (index = 0; index < itfs_len; index++) {
const u2 interface_index = stream->get_u2(CHECK);
- Klass* interf;
check_property(
valid_klass_reference_at(interface_index),
"Interface name has bad constant pool index %u in class file %s",
interface_index, CHECK);
- if (cp->tag_at(interface_index).is_klass()) {
- interf = cp->resolved_klass_at(interface_index);
- } else {
- Symbol* const unresolved_klass = cp->klass_name_at(interface_index);
-
- // Don't need to check legal name because it's checked when parsing constant pool.
- // But need to make sure it's not an array type.
- guarantee_property(unresolved_klass->char_at(0) != JVM_SIGNATURE_ARRAY,
- "Bad interface name in class file %s", CHECK);
-
- // Call resolve_super so class circularity is checked
- interf = SystemDictionary::resolve_super_or_fail(
- _class_name,
- unresolved_klass,
- Handle(THREAD, _loader_data->class_loader()),
- _protection_domain,
- false,
- CHECK);
- }
-
- if (!interf->is_interface()) {
- THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
- err_msg("class %s can not implement %s, because it is not an interface (%s)",
- _class_name->as_klass_external_name(),
- interf->external_name(),
- interf->class_in_module_of_loader()));
- }
-
- if (InstanceKlass::cast(interf)->has_nonstatic_concrete_methods()) {
- *has_nonstatic_concrete_methods = true;
- }
- _local_interfaces->at_put(index, InstanceKlass::cast(interf));
+ _local_interface_indexes->at_put_grow(index, interface_index);
}
if (!_need_verify || itfs_len <= 1) {
return;
}
// Check if there's any duplicates in interfaces
ResourceMark rm(THREAD);
// Set containing interface names
ResourceHashtable<Symbol*, int>* interface_names = new ResourceHashtable<Symbol*, int>();
for (index = 0; index < itfs_len; index++) {
- const InstanceKlass* const k = _local_interfaces->at(index);
- Symbol* interface_name = k->name();
+ Symbol* interface_name = cp->klass_name_at(_local_interface_indexes->at(index));
// If no duplicates, add (name, nullptr) in hashtable interface_names.
if (!interface_names->put(interface_name, 0)) {
classfile_parse_error("Duplicate interface name \"%s\" in class file %s",
interface_name->as_C_string(), THREAD);
return;
STATIC_OOP, // Oops
STATIC_BYTE, // Boolean, Byte, char
STATIC_SHORT, // shorts
STATIC_WORD, // ints
STATIC_DOUBLE, // aligned long or double
+ STATIC_INLINE, // inline type field
NONSTATIC_OOP,
NONSTATIC_BYTE,
NONSTATIC_SHORT,
NONSTATIC_WORD,
NONSTATIC_DOUBLE,
+ NONSTATIC_INLINE,
MAX_FIELD_ALLOCATION_TYPE,
BAD_ALLOCATION_TYPE = -1
};
static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = {
NONSTATIC_SHORT, // T_SHORT = 9,
NONSTATIC_WORD, // T_INT = 10,
NONSTATIC_DOUBLE, // T_LONG = 11,
NONSTATIC_OOP, // T_OBJECT = 12,
NONSTATIC_OOP, // T_ARRAY = 13,
- BAD_ALLOCATION_TYPE, // T_VOID = 14,
- BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
- BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16,
- BAD_ALLOCATION_TYPE, // T_METADATA = 17,
- BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
- BAD_ALLOCATION_TYPE, // T_CONFLICT = 19,
+ NONSTATIC_OOP, // T_PRIMITIVE_OBJECT = 14,
+ BAD_ALLOCATION_TYPE, // T_VOID = 15,
+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 16,
+ BAD_ALLOCATION_TYPE, // T_NARROWOOP = 17,
+ BAD_ALLOCATION_TYPE, // T_METADATA = 18,
+ BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 20,
BAD_ALLOCATION_TYPE, // 0
BAD_ALLOCATION_TYPE, // 1
BAD_ALLOCATION_TYPE, // 2
BAD_ALLOCATION_TYPE, // 3
STATIC_BYTE , // T_BOOLEAN = 4,
STATIC_SHORT, // T_SHORT = 9,
STATIC_WORD, // T_INT = 10,
STATIC_DOUBLE, // T_LONG = 11,
STATIC_OOP, // T_OBJECT = 12,
STATIC_OOP, // T_ARRAY = 13,
- BAD_ALLOCATION_TYPE, // T_VOID = 14,
- BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
- BAD_ALLOCATION_TYPE, // T_NARROWOOP = 16,
- BAD_ALLOCATION_TYPE, // T_METADATA = 17,
- BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 18,
- BAD_ALLOCATION_TYPE, // T_CONFLICT = 19,
+ STATIC_OOP, // T_PRIMITIVE_OBJECT = 14,
+ BAD_ALLOCATION_TYPE, // T_VOID = 15,
+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 16,
+ BAD_ALLOCATION_TYPE, // T_NARROWOOP = 17,
+ BAD_ALLOCATION_TYPE, // T_METADATA = 18,
+ BAD_ALLOCATION_TYPE, // T_NARROWKLASS = 19,
+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 20
};
- static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
+ static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type, bool is_inline_type) {
assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
assert(result != BAD_ALLOCATION_TYPE, "bad type");
+ if (is_inline_type) {
+ result = is_static ? STATIC_INLINE : NONSTATIC_INLINE;
+ }
return result;
}
class ClassFileParser::FieldAllocationCount : public ResourceObj {
public:
for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) {
count[i] = 0;
}
}
- void update(bool is_static, BasicType type) {
- FieldAllocationType atype = basic_type_to_atype(is_static, type);
+ void update(bool is_static, BasicType type, bool is_inline_type) {
+ FieldAllocationType atype = basic_type_to_atype(is_static, type, is_inline_type);
if (atype != BAD_ALLOCATION_TYPE) {
// Make sure there is no overflow with injected fields.
assert(count[atype] < 0xFFFF, "More than 65535 fields");
count[atype]++;
}
};
// Side-effects: populates the _fields, _fields_annotations,
// _fields_type_annotations fields
void ClassFileParser::parse_fields(const ClassFileStream* const cfs,
- bool is_interface,
+ AccessFlags class_access_flags,
FieldAllocationCount* const fac,
ConstantPool* cp,
const int cp_size,
u2* const java_fields_count_ptr,
TRAPS) {
assert(java_fields_count_ptr != nullptr, "invariant");
assert(nullptr == _fields_annotations, "invariant");
assert(nullptr == _fields_type_annotations, "invariant");
+ bool is_inline_type = class_access_flags.is_value_class() && !class_access_flags.is_abstract();
cfs->guarantee_more(2, CHECK); // length
const u2 length = cfs->get_u2_fast();
*java_fields_count_ptr = length;
int num_injected = 0;
const InjectedField* const injected = JavaClasses::get_injected(_class_name,
&num_injected);
- const int total_fields = length + num_injected;
+
+ // two more slots are required for inline classes:
+ // one for the static field with a reference to the pre-allocated default value
+ // one for the field the JVM injects when detecting an empty inline class
+ const int total_fields = length + num_injected + (is_inline_type ? 2 : 0);
// Allocate a temporary resource array to collect field data.
// After parsing all fields, data are stored in a UNSIGNED5 compressed stream.
_temp_field_info = new GrowableArray<FieldInfo>(total_fields);
+ int instance_fields_count = 0;
ResourceMark rm(THREAD);
for (int n = 0; n < length; n++) {
// access_flags, name_index, descriptor_index, attributes_count
cfs->guarantee_more(8, CHECK);
+ jint recognized_modifiers = JVM_RECOGNIZED_FIELD_MODIFIERS;
+
+ const jint flags = cfs->get_u2_fast() & recognized_modifiers;
+ verify_legal_field_modifiers(flags, class_access_flags, CHECK);
AccessFlags access_flags;
- const jint flags = cfs->get_u2_fast() & JVM_RECOGNIZED_FIELD_MODIFIERS;
- verify_legal_field_modifiers(flags, is_interface, CHECK);
access_flags.set_flags(flags);
FieldInfo::FieldFlags fieldFlags(0);
const u2 name_index = cfs->get_u2_fast();
check_property(valid_symbol_at(name_index),
check_property(valid_symbol_at(signature_index),
"Invalid constant pool index %u for field signature in class file %s",
signature_index, CHECK);
const Symbol* const sig = cp->symbol_at(signature_index);
verify_legal_field_signature(name, sig, CHECK);
+ if (!access_flags.is_static()) instance_fields_count++;
u2 constantvalue_index = 0;
bool is_synthetic = false;
u2 generic_signature_index = 0;
const bool is_static = access_flags.is_static();
}
const BasicType type = cp->basic_type_for_signature_at(signature_index);
// Update FieldAllocationCount for this kind of field
- fac->update(is_static, type);
+ fac->update(is_static, type, type == T_PRIMITIVE_OBJECT);
+
+ // Here, we still detect that the field's type is an inline type by checking if it has
+ // a Q-descriptor. This test will be replaced later by something not relying on Q-desriptors.
+ // From this point forward, checking if a field's type is an inline type should be performed
+ // using the inline_type flag of FieldFlags, and not by looking for a Q-descriptor in its signature
+ if (type == T_PRIMITIVE_OBJECT) fieldFlags.update_null_free_inline_type(true);
FieldInfo fi(access_flags, name_index, signature_index, constantvalue_index, fieldFlags);
fi.set_index(n);
if (fieldFlags.is_generic()) {
fi.set_generic_signature_index(generic_signature_index);
fi.set_index(index);
_temp_field_info->append(fi);
// Update FieldAllocationCount for this kind of field
const BasicType type = Signature::basic_type(injected[n].signature());
- fac->update(false, type);
+ fac->update(false, type, false);
index++;
}
}
+ if (is_inline_type) {
+ // Inject static ".default" field
+ FieldInfo::FieldFlags fflags(0);
+ fflags.update_injected(true);
+ AccessFlags aflags(JVM_ACC_STATIC);
+ FieldInfo fi(aflags,
+ (u2)vmSymbols::as_int(VM_SYMBOL_ENUM_NAME(default_value_name)),
+ (u2)vmSymbols::as_int(VM_SYMBOL_ENUM_NAME(object_signature)),
+ 0,
+ fflags);
+ fi.set_index(index);
+ _temp_field_info->append(fi);
+
+ const BasicType type = Signature::basic_type(vmSymbols::object_signature());
+ fac->update(true, type, false);
+ index++;
+ }
+
+ if (is_inline_type && instance_fields_count == 0) {
+ // Inject ".empty" dummy field
+ _is_empty_inline_type = true;
+
+ FieldInfo::FieldFlags fflags(0);
+ fflags.update_injected(true);
+ AccessFlags aflags;
+ FieldInfo fi(aflags,
+ (u2)vmSymbols::as_int(VM_SYMBOL_ENUM_NAME(empty_marker_name)),
+ (u2)vmSymbols::as_int(VM_SYMBOL_ENUM_NAME(byte_signature)),
+ 0,
+ fflags);
+ fi.set_index(index);
+ _temp_field_info->append(fi);
+
+ const BasicType type = Signature::basic_type(vmSymbols::byte_signature());
+ fac->update(false, type, false);
+ index++;
+ }
+
+ if (instance_fields_count > 0) {
+ _has_nonstatic_fields = true;
+ }
+
assert(_temp_field_info->length() == index, "Must be");
if (_need_verify && length > 1) {
// Check duplicated fields
ResourceMark rm(THREAD);
const Symbol* sig,
TRAPS) const {
assert(name != nullptr, "invariant");
assert(sig != nullptr, "invariant");
+ const char* class_note = "";
+ if (is_inline_type() && name == vmSymbols::object_initializer_name()) {
+ class_note = " (an inline class)";
+ }
+
ResourceMark rm(THREAD);
Exceptions::fthrow(THREAD_AND_LOCATION,
vmSymbols::java_lang_ClassFormatError(),
- "%s \"%s\" in class %s has illegal signature \"%s\"", type,
- name->as_C_string(), _class_name->as_C_string(), sig->as_C_string());
+ "%s \"%s\" in class %s%s has illegal signature \"%s\"", type,
+ name->as_C_string(), _class_name->as_C_string(), class_note, sig->as_C_string());
}
AnnotationCollector::ID
AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
const Symbol* name,
//
// The has_localvariable_table parameter is used to pass up the value to InstanceKlass.
Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
bool is_interface,
+ bool is_value_class,
+ bool is_abstract_class,
const ConstantPool* cp,
bool* const has_localvariable_table,
TRAPS) {
assert(cfs != nullptr, "invariant");
assert(cp != nullptr, "invariant");
} else {
classfile_parse_error("Method <clinit> is not static in class file %s", THREAD);
return nullptr;
}
} else {
- verify_legal_method_modifiers(flags, is_interface, name, CHECK_NULL);
+ verify_legal_method_modifiers(flags, access_flags() , name, CHECK_NULL);
+ }
+
+ if (EnableValhalla && supports_inline_types() && name == vmSymbols::inline_factory_name()) {
+ if (is_interface) {
+ classfile_parse_error("Interface cannot have a method named <vnew>, class file %s", CHECK_NULL);
+ } else if (!is_value_class) {
+ classfile_parse_error("Identity class cannot have a method <vnew>, class file %s", CHECK_NULL);
+ } else if (signature->is_void_method_signature()) {
+ classfile_parse_error("Factory method <vnew> must have a non-void return type, class file %s", CHECK_NULL);
+ } else { // also OK, a static factory, as long as the return value is good
+ bool ok = false;
+ SignatureStream ss((Symbol*) signature, true);
+ while (!ss.at_return_type()) ss.next();
+ if (ss.is_reference()) {
+ Symbol* ret = ss.as_symbol();
+ const Symbol* required = class_name();
+ if (is_hidden()) {
+ // The original class name for hidden classes changed.
+ /// So using the original name in the return type is no longer valid.
+ required = vmSymbols::java_lang_Object();
+ }
+ ok = (ret == required);
+ }
+ if (!ok) {
+ throwIllegalSignature("Method", name, signature, CHECK_0);
+ }
+ // factory method, with a non-void return. No other
+ // definition of <vnew> is possible.
+ //
+ // The verifier (in verify_invoke_instructions) will inspect the
+ // signature of any attempt to invoke <vnew>, and ensure that it
+ // returns non-void.
+ }
}
- if (name == vmSymbols::object_initializer_name() && is_interface) {
- classfile_parse_error("Interface cannot have a method named <init>, class file %s", THREAD);
- return nullptr;
+ if (name == vmSymbols::object_initializer_name()) {
+ if (is_interface) {
+ classfile_parse_error("Interface cannot have a method named <init>, class file %s", CHECK_NULL);
+ } else if ((!is_value_class || is_abstract_class) && signature->is_void_method_signature()) {
+ // OK, a constructor
+ } else {
+ // not OK, so throw the same error as in verify_legal_method_signature.
+ throwIllegalSignature("Method", name, signature, CHECK_0);
+ }
+ // A declared <init> method must always be a non-static
+ // object constructor, with a void return.
+ //
+ // The verifier (in verify_invoke_instructions) will inspect the
+ // signature of any attempt to invoke <init>, and ensure that it
+ // returns void.
+ }
+
+ if (EnableValhalla) {
+ if (((flags & JVM_ACC_SYNCHRONIZED) == JVM_ACC_SYNCHRONIZED)
+ && ((flags & JVM_ACC_STATIC) == 0 )
+ && !carries_identity_modifier()) {
+ classfile_parse_error("Invalid synchronized method in non-identity class %s", THREAD);
+ return nullptr;
+ }
}
int args_size = -1; // only used when _need_verify is true
if (_need_verify) {
verify_legal_name_with_signature(name, signature, CHECK_NULL);
// Side-effects: populates the _methods field in the parser
void ClassFileParser::parse_methods(const ClassFileStream* const cfs,
bool is_interface,
+ bool is_value_class,
+ bool is_abstract_type,
bool* const has_localvariable_table,
bool* has_final_method,
bool* declares_nonstatic_concrete_methods,
TRAPS) {
assert(cfs != nullptr, "invariant");
CHECK);
for (int index = 0; index < length; index++) {
Method* method = parse_method(cfs,
is_interface,
+ is_value_class,
+ is_abstract_type,
_cp,
has_localvariable_table,
CHECK);
if (method->is_final()) {
inner_name_index, CHECK_0);
if (_need_verify) {
guarantee_property(inner_class_info_index != outer_class_info_index,
"Class is both outer and inner class in class file %s", CHECK_0);
}
- // Access flags
- jint flags;
+
+ jint recognized_modifiers = RECOGNIZED_INNER_CLASS_MODIFIERS;
// JVM_ACC_MODULE is defined in JDK-9 and later.
if (_major_version >= JAVA_9_VERSION) {
- flags = cfs->get_u2_fast() & (RECOGNIZED_INNER_CLASS_MODIFIERS | JVM_ACC_MODULE);
- } else {
- flags = cfs->get_u2_fast() & RECOGNIZED_INNER_CLASS_MODIFIERS;
+ recognized_modifiers |= JVM_ACC_MODULE;
}
+ if (supports_inline_types()) {
+ recognized_modifiers |= JVM_ACC_PRIMITIVE | JVM_ACC_VALUE | JVM_ACC_IDENTITY;
+ }
+
+ // Access flags
+ jint flags = cfs->get_u2_fast() & recognized_modifiers;
+
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
// Set abstract bit for old class files for backward compatibility
flags |= JVM_ACC_ABSTRACT;
}
- verify_legal_class_modifiers(flags, CHECK_0);
+
+ if (EnableValhalla) {
+ if (!supports_inline_types()) {
+ const bool is_module = (flags & JVM_ACC_MODULE) != 0;
+ const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0;
+ if (!is_module && !is_interface) {
+ flags |= JVM_ACC_IDENTITY;
+ }
+ }
+ }
+
+ const char* name = inner_name_index == 0 ? "unnamed" : cp->symbol_at(inner_name_index)->as_utf8();
+ verify_legal_class_modifiers(flags, name, false, CHECK_0);
AccessFlags inner_access_flags(flags);
inner_classes->at_put(index++, inner_class_info_index);
inner_classes->at_put(index++, outer_class_info_index);
inner_classes->at_put(index++, inner_name_index);
cfs->set_current(current_mark);
return length;
}
+ u2 ClassFileParser::parse_classfile_preload_attribute(const ClassFileStream* const cfs,
+ const u1* const preload_attribute_start,
+ TRAPS) {
+ const u1* const current_mark = cfs->current();
+ u2 length = 0;
+ if (preload_attribute_start != nullptr) {
+ cfs->set_current(preload_attribute_start);
+ cfs->guarantee_more(2, CHECK_0); // length
+ length = cfs->get_u2_fast();
+ }
+ const int size = length;
+ Array<u2>* const preload_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0);
+ _preload_classes = preload_classes;
+ if (length > 0) {
+ int index = 0;
+ cfs->guarantee_more(2 * length, CHECK_0);
+ for (int n = 0; n < length; n++) {
+ const u2 class_info_index = cfs->get_u2_fast();
+ check_property(
+ valid_klass_reference_at(class_info_index),
+ "Preload class_info_index %u has bad constant type in class file %s",
+ class_info_index, CHECK_0);
+ preload_classes->at_put(index++, class_info_index);
+ }
+ assert(index == size, "wrong size");
+ }
+
+ // Restore buffer's current position.
+ cfs->set_current(current_mark);
+
+ return length;
+ }
+
// Record {
// u2 attribute_name_index;
// u4 attribute_length;
// u2 components_count;
// component_info components[components_count];
_inner_classes = Universe::the_empty_short_array();
// Set nest members attribute to default sentinel
_nest_members = Universe::the_empty_short_array();
// Set _permitted_subclasses attribute to default sentinel
_permitted_subclasses = Universe::the_empty_short_array();
+ // Set _preload_classes attribute to default sentinel
+ _preload_classes = Universe::the_empty_short_array();
cfs->guarantee_more(2, CHECK); // attributes_count
u2 attributes_count = cfs->get_u2_fast();
bool parsed_sourcefile_attribute = false;
bool parsed_innerclasses_attribute = false;
bool parsed_nest_members_attribute = false;
bool parsed_permitted_subclasses_attribute = false;
+ bool parsed_preload_attribute = false;
bool parsed_nest_host_attribute = false;
bool parsed_record_attribute = false;
bool parsed_enclosingmethod_attribute = false;
bool parsed_bootstrap_methods_attribute = false;
const u1* runtime_visible_annotations = nullptr;
u4 nest_members_attribute_length = 0;
const u1* record_attribute_start = nullptr;
u4 record_attribute_length = 0;
const u1* permitted_subclasses_attribute_start = nullptr;
u4 permitted_subclasses_attribute_length = 0;
+ const u1* preload_attribute_start = nullptr;
+ u4 preload_attribute_length = 0;
// Iterate over attributes
while (attributes_count--) {
cfs->guarantee_more(6, CHECK); // attribute_name_index, attribute_length
const u2 attribute_name_index = cfs->get_u2_fast();
}
parsed_permitted_subclasses_attribute = true;
permitted_subclasses_attribute_start = cfs->current();
permitted_subclasses_attribute_length = attribute_length;
}
+ if (EnableValhalla && tag == vmSymbols::tag_preload()) {
+ if (parsed_preload_attribute) {
+ classfile_parse_error("Multiple Preload attributes in class file %s", CHECK);
+ return;
+ }
+ parsed_preload_attribute = true;
+ preload_attribute_start = cfs->current();
+ preload_attribute_length = attribute_length;
+ }
}
// Skip attribute_length for any attribute where major_verson >= JAVA_17_VERSION
cfs->skip_u1(attribute_length, CHECK);
} else {
// Unknown attribute
permitted_subclasses_attribute_length == sizeof(num_subclasses) + sizeof(u2) * num_subclasses,
"Wrong PermittedSubclasses attribute length in class file %s", CHECK);
}
}
+ if (parsed_preload_attribute) {
+ const u2 num_classes = parse_classfile_preload_attribute(
+ cfs,
+ preload_attribute_start,
+ CHECK);
+ if (_need_verify) {
+ guarantee_property(
+ preload_attribute_length == sizeof(num_classes) + sizeof(u2) * num_classes,
+ "Wrong Preload attribute length in class file %s", CHECK);
+ }
+ }
+
if (_max_bootstrap_specifier_index >= 0) {
guarantee_property(parsed_bootstrap_methods_attribute,
"Missing BootstrapMethods attribute in class file %s", CHECK);
}
}
this_klass->set_fields_status(_fields_status);
this_klass->set_methods(_methods);
this_klass->set_inner_classes(_inner_classes);
this_klass->set_nest_members(_nest_members);
this_klass->set_nest_host_index(_nest_host);
+ this_klass->set_preload_classes(_preload_classes);
this_klass->set_annotations(_combined_annotations);
this_klass->set_permitted_subclasses(_permitted_subclasses);
this_klass->set_record_components(_record_components);
// Delay the setting of _local_interfaces and _transitive_interfaces until after
// initialize_supers() in fill_instance_klass(). It is because the _local_interfaces could
assert(cp != nullptr, "invariant");
const InstanceKlass* super_klass = nullptr;
if (super_class_index == 0) {
check_property(_class_name == vmSymbols::java_lang_Object(),
- "Invalid superclass index %u in class file %s",
- super_class_index,
+ "Invalid superclass index 0 in class file %s",
CHECK_NULL);
} else {
check_property(valid_klass_reference_at(super_class_index),
"Invalid superclass index %u in class file %s",
super_class_index,
CHECK_NULL);
// The class name should be legal because it is checked when parsing constant pool.
// However, make sure it is not an array type.
- bool is_array = false;
if (cp->tag_at(super_class_index).is_klass()) {
super_klass = InstanceKlass::cast(cp->resolved_klass_at(super_class_index));
- if (need_verify)
- is_array = super_klass->is_array_klass();
- } else if (need_verify) {
- is_array = (cp->klass_name_at(super_class_index)->char_at(0) == JVM_SIGNATURE_ARRAY);
}
if (need_verify) {
+ bool is_array = (cp->klass_name_at(super_class_index)->char_at(0) == JVM_SIGNATURE_ARRAY);
guarantee_property(!is_array,
"Bad superclass name in class file %s", CHECK_NULL);
}
}
return super_klass;
void OopMapBlocksBuilder::print_value_on(outputStream* st) const {
print_on(st);
}
+ void ClassFileParser::throwInlineTypeLimitation(THREAD_AND_LOCATION_DECL,
+ const char* msg,
+ const Symbol* name,
+ const Symbol* sig) const {
+
+ ResourceMark rm(THREAD);
+ if (name == nullptr || sig == nullptr) {
+ Exceptions::fthrow(THREAD_AND_LOCATION_ARGS,
+ vmSymbols::java_lang_ClassFormatError(),
+ "class: %s - %s", _class_name->as_C_string(), msg);
+ }
+ else {
+ Exceptions::fthrow(THREAD_AND_LOCATION_ARGS,
+ vmSymbols::java_lang_ClassFormatError(),
+ "\"%s\" sig: \"%s\" class: %s - %s", name->as_C_string(), sig->as_C_string(),
+ _class_name->as_C_string(), msg);
+ }
+ }
+
void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
assert(ik != nullptr, "invariant");
const InstanceKlass* const super = ik->java_super();
#endif
// Check if this klass supports the java.lang.Cloneable interface
if (vmClasses::Cloneable_klass_loaded()) {
if (ik->is_subtype_of(vmClasses::Cloneable_klass())) {
+ if (ik->is_inline_klass()) {
+ JavaThread *THREAD = JavaThread::current();
+ throwInlineTypeLimitation(THREAD_AND_LOCATION, "Inline Types do not support Cloneable");
+ return;
+ }
ik->set_is_cloneable();
}
}
// Check if this klass has a vanilla default constructor
const jint lh = Klass::instance_layout_helper(ik->size_helper(), true);
ik->set_layout_helper(lh);
}
}
+ bool ClassFileParser::supports_inline_types() const {
+ // Inline types are only supported by class file version 61.65535 and later
+ return _major_version > JAVA_22_VERSION ||
+ (_major_version == JAVA_22_VERSION /*&& _minor_version == JAVA_PREVIEW_MINOR_VERSION*/); // JAVA_PREVIEW_MINOR_VERSION not yet implemented by javac, check JVMS draft
+ }
+
// utility methods for appending an array with check for duplicates
static void append_interfaces(GrowableArray<InstanceKlass*>* result,
const Array<InstanceKlass*>* const ifs) {
// iterate over new interfaces
// no interfaces, use canonicalized array
return Universe::the_empty_instance_klass_array();
} else if (max_transitive_size == super_size) {
// no new local interfaces added, share superklass' transitive interface array
return super->transitive_interfaces();
- } else if (max_transitive_size == local_size) {
- // only local interfaces added, share local interface array
- return local_ifs;
+ // The three lines below are commented to work around bug JDK-8245487
+ // } else if (max_transitive_size == local_size) {
+ // // only local interfaces added, share local interface array
+ // return local_ifs;
} else {
ResourceMark rm;
GrowableArray<InstanceKlass*>* const result = new GrowableArray<InstanceKlass*>(max_transitive_size);
// Copy down from superclass
append_interfaces(result, local_ifs);
// length will be less than the max_transitive_size if duplicates were removed
const int length = result->length();
assert(length <= max_transitive_size, "just checking");
+
Array<InstanceKlass*>* const new_result =
MetadataFactory::new_array<InstanceKlass*>(loader_data, length, CHECK_NULL);
for (int i = 0; i < length; i++) {
InstanceKlass* const e = result->at(i);
assert(e != nullptr, "just checking");
if (super_ik->is_sealed() && !super_ik->has_as_permitted_subclass(this_klass)) {
classfile_icce_error("class %s cannot inherit from sealed class %s", super_ik, THREAD);
return;
}
+ // The JVMS says that super classes for value types must not have the ACC_IDENTITY
+ // flag set. But, java.lang.Object must still be allowed to be a direct super class
+ // for a value classes. So, it is treated as a special case for now.
+ if (this_klass->access_flags().is_value_class() &&
+ super_ik->name() != vmSymbols::java_lang_Object() &&
+ super_ik->is_identity_class()) {
+ classfile_icce_error("value class %s cannot inherit from class %s", super_ik, THREAD);
+ return;
+ }
+
// If the loader is not the boot loader then throw an exception if its
// superclass is in package jdk.internal.reflect and its loader is not a
// special reflection class loader
if (!this_klass->class_loader_data()->is_the_null_class_loader_data()) {
PackageEntry* super_package = super->package();
}
}
// utility methods for format checking
- void ClassFileParser::verify_legal_class_modifiers(jint flags, TRAPS) const {
+ void ClassFileParser::verify_legal_class_modifiers(jint flags, const char* name, bool is_Object, TRAPS) const {
const bool is_module = (flags & JVM_ACC_MODULE) != 0;
+ const bool is_value_class = (flags & JVM_ACC_VALUE) != 0;
+ const bool is_primitive_class = (flags & JVM_ACC_PRIMITIVE) != 0;
+ const bool is_identity_class = (flags & JVM_ACC_IDENTITY) != 0;
+ const bool is_inner_class = name != nullptr;
assert(_major_version >= JAVA_9_VERSION || !is_module, "JVM_ACC_MODULE should not be set");
if (is_module) {
ResourceMark rm(THREAD);
Exceptions::fthrow(
THREAD_AND_LOCATION,
"%s is not a class because access_flag ACC_MODULE is set",
_class_name->as_C_string());
return;
}
- if (!_need_verify) { return; }
+ if (is_value_class && !EnableValhalla) {
+ ResourceMark rm(THREAD);
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Class modifier ACC_VALUE in class %s requires option -XX:+EnableValhalla",
+ _class_name->as_C_string()
+ );
+ return;
+ }
+
+ if (is_primitive_class && !EnablePrimitiveClasses) {
+ ResourceMark rm(THREAD);
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Class modifier ACC_PRIMITIVE in class %s requires option -XX:+EnablePrimitiveClasses",
+ _class_name->as_C_string()
+ );
+ return;
+ }
+
+ // if (!_need_verify) { return; }
const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0;
const bool is_abstract = (flags & JVM_ACC_ABSTRACT) != 0;
const bool is_final = (flags & JVM_ACC_FINAL) != 0;
const bool is_super = (flags & JVM_ACC_SUPER) != 0;
const bool is_annotation = (flags & JVM_ACC_ANNOTATION) != 0;
const bool major_gte_1_5 = _major_version >= JAVA_1_5_VERSION;
if ((is_abstract && is_final) ||
(is_interface && !is_abstract) ||
- (is_interface && major_gte_1_5 && (is_super || is_enum)) ||
- (!is_interface && major_gte_1_5 && is_annotation)) {
+ (is_interface && major_gte_1_5 && ((is_super && (!EnableValhalla || !supports_inline_types())) || is_enum)) || // ACC_SUPER (now ACC_IDENTITY) was illegal for interfaces
+ (!is_interface && major_gte_1_5 && is_annotation) ||
+ (is_value_class && is_enum) ||
+ (is_identity_class && is_value_class) ||
+ (EnableValhalla && supports_inline_types() && !is_module && !is_abstract && !is_Object && !(is_identity_class || is_value_class) && !is_inner_class) ||
+ (EnablePrimitiveClasses && supports_inline_types() && is_primitive_class && (!is_value_class || !is_final || is_interface || is_abstract))) {
ResourceMark rm(THREAD);
- Exceptions::fthrow(
- THREAD_AND_LOCATION,
- vmSymbols::java_lang_ClassFormatError(),
- "Illegal class modifiers in class %s: 0x%X",
- _class_name->as_C_string(), flags
- );
- return;
+ const char* class_note = "";
+ if (is_value_class) class_note = " (a value class)";
+ if (is_primitive_class) class_note = " (a primitive class)";
+ if (is_value_class && is_identity_class) class_note = " (a value and identity class)";
+ if (name == nullptr) { // Not an inner class
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Illegal class modifiers in class %s%s: 0x%X",
+ _class_name->as_C_string(), class_note, flags
+ );
+ return;
+ } else {
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Illegal class modifiers in declaration of inner class %s%s of class %s: 0x%X",
+ name, class_note, _class_name->as_C_string(), flags
+ );
+ return;
+ }
}
}
static bool has_illegal_visibility(jint flags) {
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
classfile_ucve_error("%s (class file version %u.%u) was compiled with an invalid non-zero minor version",
class_name, major, minor, THREAD);
}
}
- void ClassFileParser::verify_legal_field_modifiers(jint flags,
- bool is_interface,
+ void ClassFileParser:: verify_legal_field_modifiers(jint flags,
+ AccessFlags class_access_flags,
TRAPS) const {
if (!_need_verify) { return; }
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
const bool is_volatile = (flags & JVM_ACC_VOLATILE) != 0;
const bool is_transient = (flags & JVM_ACC_TRANSIENT) != 0;
const bool is_enum = (flags & JVM_ACC_ENUM) != 0;
const bool major_gte_1_5 = _major_version >= JAVA_1_5_VERSION;
+ const bool is_interface = class_access_flags.is_interface();
+ const bool is_abstract = class_access_flags.is_abstract();
+ const bool is_value_class = class_access_flags.is_value_class();
+ const bool is_identity_class = class_access_flags.is_identity_class();
+
bool is_illegal = false;
if (is_interface) {
if (!is_public || !is_static || !is_final || is_private ||
is_protected || is_volatile || is_transient ||
is_illegal = true;
}
} else { // not interface
if (has_illegal_visibility(flags) || (is_final && is_volatile)) {
is_illegal = true;
+ } else {
+ if (is_value_class && !is_abstract && !is_static && !is_final) {
+ is_illegal = true;
+ } else if (is_abstract && !is_identity_class && !is_static) {
+ is_illegal = true;
+ }
}
}
if (is_illegal) {
ResourceMark rm(THREAD);
return;
}
}
void ClassFileParser::verify_legal_method_modifiers(jint flags,
- bool is_interface,
+ AccessFlags class_access_flags,
const Symbol* name,
TRAPS) const {
if (!_need_verify) { return; }
const bool is_public = (flags & JVM_ACC_PUBLIC) != 0;
const bool is_protected = (flags & JVM_ACC_PROTECTED) != 0;
const bool major_gte_1_5 = _major_version >= JAVA_1_5_VERSION;
const bool major_gte_8 = _major_version >= JAVA_8_VERSION;
const bool major_gte_17 = _major_version >= JAVA_17_VERSION;
const bool is_initializer = (name == vmSymbols::object_initializer_name());
+ const bool is_factory = (name == vmSymbols::inline_factory_name() && supports_inline_types());
+ const bool is_interface = class_access_flags.is_interface();
+ const bool is_value_class = class_access_flags.is_value_class();
+ const bool is_identity_class = class_access_flags.is_identity_class();
+ const bool is_abstract_class = class_access_flags.is_abstract();
bool is_illegal = false;
+ const char* class_note = "";
if (is_interface) {
if (major_gte_8) {
// Class file version is JAVA_8_VERSION or later Methods of
// interfaces may set any of the flags except ACC_PROTECTED,
// ACC_FINAL, ACC_NATIVE, and ACC_SYNCHRONIZED; they must
}
} else { // not interface
if (has_illegal_visibility(flags)) {
is_illegal = true;
} else {
- if (is_initializer) {
+ if (is_factory) { // <vnew> factory method
+ if (is_final || is_synchronized || is_native || !is_static ||
+ is_abstract || is_bridge) {
+ is_illegal = true;
+ class_note = (is_value_class ? " (a value class)" : " (not a value class)");
+ }
+ } else if (is_initializer) {
if (is_static || is_final || is_synchronized || is_native ||
is_abstract || (major_gte_1_5 && is_bridge)) {
is_illegal = true;
}
} else { // not initializer
- if (is_abstract) {
- if ((is_final || is_native || is_private || is_static ||
- (major_gte_1_5 && (is_synchronized || (!major_gte_17 && is_strict))))) {
- is_illegal = true;
+ if (!is_identity_class && is_synchronized && !is_static) {
+ is_illegal = true;
+ class_note = " (not an identity class)";
+ } else {
+ if (is_abstract) {
+ if ((is_final || is_native || is_private || is_static ||
+ (major_gte_1_5 && (is_synchronized || (!major_gte_17 && is_strict))))) {
+ is_illegal = true;
+ }
}
}
}
}
}
if (is_illegal) {
ResourceMark rm(THREAD);
- Exceptions::fthrow(
- THREAD_AND_LOCATION,
- vmSymbols::java_lang_ClassFormatError(),
- "Method %s in class %s has illegal modifiers: 0x%X",
- name->as_C_string(), _class_name->as_C_string(), flags);
+ if (is_value_class && is_initializer) {
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Method <init> is not allowed in value class %s",
+ _class_name->as_C_string());
+ } else {
+ Exceptions::fthrow(
+ THREAD_AND_LOCATION,
+ vmSymbols::java_lang_ClassFormatError(),
+ "Method %s in class %s%s has illegal modifiers: 0x%X",
+ name->as_C_string(), _class_name->as_C_string(),
+ class_note, flags);
+ }
return;
}
}
void ClassFileParser::verify_legal_utf8(const unsigned char* buffer,
case JVM_SIGNATURE_INT:
case JVM_SIGNATURE_FLOAT:
case JVM_SIGNATURE_LONG:
case JVM_SIGNATURE_DOUBLE:
return signature + 1;
- case JVM_SIGNATURE_CLASS: {
+ case JVM_SIGNATURE_PRIMITIVE_OBJECT:
+ // Can't enable this check fully until JDK upgrades the bytecode generators (TODO: JDK-8270852).
+ // For now, compare to class file version 51 so old verifier doesn't see Q signatures.
+ if ( (_major_version < 51 /* CONSTANT_CLASS_DESCRIPTORS */ ) || (!EnablePrimitiveClasses)) {
+ classfile_parse_error("Class name contains illegal Q-signature "
+ "in descriptor in class file %s, requires option -XX:+EnablePrimitiveClasses",
+ CHECK_0);
+ return nullptr;
+ }
+ // fall through
+ case JVM_SIGNATURE_CLASS:
+ {
if (_major_version < JAVA_1_5_VERSION) {
// Skip over the class name if one is there
const char* const p = skip_over_field_name(signature + 1, true, --length);
// The next character better be a semicolon
if (p && (p - signature) > 1 && p[0] == JVM_SIGNATURE_ENDCLASS) {
return p + 1;
}
}
else {
- // Skip leading 'L' and ignore first appearance of ';'
+ // Skip leading 'L' or 'Q' and ignore first appearance of ';'
signature++;
const char* c = (const char*) memchr(signature, JVM_SIGNATURE_ENDCLASS, length - 1);
// Format check signature
if (c != nullptr) {
int newlen = c - (char*) signature;
} else if (_major_version < JAVA_1_5_VERSION) {
if (bytes[0] != JVM_SIGNATURE_SPECIAL) {
p = skip_over_field_name(bytes, true, length);
legal = (p != nullptr) && ((p - bytes) == (int)length);
}
+ } else if ((_major_version >= CONSTANT_CLASS_DESCRIPTORS || _class_name->starts_with("jdk/internal/reflect/"))
+ && bytes[length - 1] == ';' ) {
+ // Support for L...; and Q...; descriptors
+ legal = verify_unqualified_name(bytes + 1, length - 2, LegalClass);
} else {
// 4900761: relax the constraints based on JSR202 spec
// Class names may be drawn from the entire Unicode character set.
// Identifiers between '/' must be unqualified names.
// The utf8 string has been verified when parsing cpool entries.
unsigned int length = name->utf8_length();
bool legal = false;
if (length > 0) {
if (bytes[0] == JVM_SIGNATURE_SPECIAL) {
- if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) {
+ if (name == vmSymbols::object_initializer_name() ||
+ name == vmSymbols::class_initializer_name() ||
+ (EnableValhalla && supports_inline_types() &&
+ name == vmSymbols::inline_factory_name())) {
legal = true;
}
} else if (_major_version < JAVA_1_5_VERSION) {
const char* p;
p = skip_over_field_name(bytes, false, length);
// Checks if signature is a legal field signature.
void ClassFileParser::verify_legal_field_signature(const Symbol* name,
const Symbol* signature,
TRAPS) const {
if (!_need_verify) { return; }
+ if ((!supports_inline_types() || !EnablePrimitiveClasses) && (signature->is_Q_signature() || signature->is_Q_array_signature())) {
+ throwIllegalSignature("Field", name, signature, CHECK);
+ }
const char* const bytes = (const char*)signature->bytes();
const unsigned int length = signature->utf8_length();
const char* const p = skip_over_field_signature(bytes, false, length, CHECK);
_major_version >= JAVA_7_VERSION) {
throwIllegalSignature("Method", name, signature, THREAD);
return;
}
- int sig_length = signature->utf8_length();
- if (name->utf8_length() > 0 &&
+ if (!is_value_class()) {
+ int sig_length = signature->utf8_length();
+ if (name->utf8_length() > 0 &&
name->char_at(0) == JVM_SIGNATURE_SPECIAL &&
sig_length > 0 &&
signature->char_at(sig_length - 1) != JVM_SIGNATURE_VOID) {
- throwIllegalSignature("Method", name, signature, THREAD);
+ throwIllegalSignature("Method", name, signature, THREAD);
+ }
}
}
// Checks if signature is a legal method signature.
// Returns number of parameters
}
fill_instance_klass(ik, changed_by_loadhook, cl_inst_info, CHECK_NULL);
assert(_klass == ik, "invariant");
-
return ik;
}
void ClassFileParser::fill_instance_klass(InstanceKlass* ik,
bool changed_by_loadhook,
ik->set_should_verify_class(_need_verify);
// Not yet: supers are done below to support the new subtype-checking fields
ik->set_nonstatic_field_size(_field_info->_nonstatic_field_size);
ik->set_has_nonstatic_fields(_field_info->_has_nonstatic_fields);
+ if (_field_info->_is_naturally_atomic && ik->is_inline_klass()) {
+ ik->set_is_naturally_atomic();
+ }
+
+ if (carries_identity_modifier()) {
+ ik->set_carries_identity_modifier();
+ } else if (carries_value_modifier()) {
+ ik->set_carries_value_modifier();
+ }
+
assert(_fac != nullptr, "invariant");
- ik->set_static_oop_field_count(_fac->count[STATIC_OOP]);
+ ik->set_static_oop_field_count(_fac->count[STATIC_OOP] + _fac->count[STATIC_INLINE]);
// this transfers ownership of a lot of arrays from
// the parser onto the InstanceKlass*
apply_parsed_class_metadata(ik, _java_fields_count);
+ if (ik->is_inline_klass()) {
+ InlineKlass::cast(ik)->init_fixed_block();
+ }
// can only set dynamic nest-host after static nest information is set
if (cl_inst_info.dynamic_nest_host() != nullptr) {
ik->set_nest_host(cl_inst_info.dynamic_nest_host());
}
assert(nullptr == _fieldinfo_stream, "invariant");
assert(nullptr == _fields_status, "invariant");
assert(nullptr == _methods, "invariant");
assert(nullptr == _inner_classes, "invariant");
assert(nullptr == _nest_members, "invariant");
+ assert(nullptr == _preload_classes, "invariant");
assert(nullptr == _combined_annotations, "invariant");
assert(nullptr == _record_components, "invariant");
assert(nullptr == _permitted_subclasses, "invariant");
if (_has_localvariable_table) {
ik->set_minor_version(_minor_version);
ik->set_major_version(_major_version);
ik->set_has_nonstatic_concrete_methods(_has_nonstatic_concrete_methods);
ik->set_declares_nonstatic_concrete_methods(_declares_nonstatic_concrete_methods);
+ if (_is_declared_atomic) {
+ ik->set_is_declared_atomic();
+ }
if (_is_hidden) {
ik->set_is_hidden();
}
// We won a potential race
JvmtiExport::add_default_read_edges(module_handle, THREAD);
}
}
+ bool all_fields_empty = true;
+ for (AllFieldStream fs(ik); !fs.done(); fs.next()) {
+ if (!fs.access_flags().is_static()) {
+ if (fs.field_descriptor().is_null_free_inline_type()) {
+ Klass* k = _inline_type_field_klasses->at(fs.index());
+ ik->set_inline_type_field_klass(fs.index(), k);
+ if (!InlineKlass::cast(k)->is_empty_inline_type()) { all_fields_empty = false; }
+ } else {
+ all_fields_empty = false;
+ }
+ } else if (is_inline_type() && (fs.name() == vmSymbols::default_value_name())) {
+ InlineKlass::cast(ik)->set_default_value_offset(ik->field_offset(fs.index()));
+ }
+ }
+
+ if (_is_empty_inline_type || (is_inline_type() && all_fields_empty)) {
+ ik->set_is_empty_inline_type();
+ }
+
+ if (is_inline_type()) {
+ InlineKlass* vk = InlineKlass::cast(ik);
+ vk->set_alignment(_alignment);
+ vk->set_first_field_offset(_first_field_offset);
+ vk->set_exact_size_in_bytes(_exact_size_in_bytes);
+ InlineKlass::cast(ik)->initialize_calling_convention(CHECK);
+ }
+
ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);
if (!is_internal()) {
ik->print_class_load_logging(_loader_data, module_entry, _stream);
_methods(nullptr),
_inner_classes(nullptr),
_nest_members(nullptr),
_nest_host(0),
_permitted_subclasses(nullptr),
+ _preload_classes(nullptr),
_record_components(nullptr),
_local_interfaces(nullptr),
+ _local_interface_indexes(nullptr),
_transitive_interfaces(nullptr),
_combined_annotations(nullptr),
_class_annotations(nullptr),
_class_type_annotations(nullptr),
_fields_annotations(nullptr),
_klass(nullptr),
_klass_to_deallocate(nullptr),
_parsed_annotations(nullptr),
_fac(nullptr),
_field_info(nullptr),
+ _inline_type_field_klasses(nullptr),
_temp_field_info(nullptr),
_method_ordering(nullptr),
_all_mirandas(nullptr),
_vtable_size(0),
_itable_size(0),
_has_nonstatic_concrete_methods(false),
_declares_nonstatic_concrete_methods(false),
_has_localvariable_table(false),
_has_final_method(false),
_has_contended_fields(false),
+ _has_inline_type_fields(false),
+ _has_nonstatic_fields(false),
+ _is_empty_inline_type(false),
+ _is_naturally_atomic(false),
+ _is_declared_atomic(false),
+ _carries_value_modifier(false),
+ _carries_identity_modifier(false),
_has_finalizer(false),
_has_empty_finalizer(false),
_has_vanilla_constructor(false),
_max_bootstrap_specifier_index(-1) {
_fields_status = nullptr;
_methods = nullptr;
_inner_classes = nullptr;
_nest_members = nullptr;
_permitted_subclasses = nullptr;
+ _preload_classes = nullptr;
_combined_annotations = nullptr;
_class_annotations = _class_type_annotations = nullptr;
_fields_annotations = _fields_type_annotations = nullptr;
_record_components = nullptr;
}
if (_fields_status != nullptr) {
MetadataFactory::free_array<FieldStatus>(_loader_data, _fields_status);
}
+ if (_inline_type_field_klasses != nullptr) {
+ MetadataFactory::free_array<InlineKlass*>(_loader_data, _inline_type_field_klasses);
+ }
+
if (_methods != nullptr) {
// Free methods
InstanceKlass::deallocate_methods(_loader_data, _methods);
}
if (_permitted_subclasses != nullptr && _permitted_subclasses != Universe::the_empty_short_array()) {
MetadataFactory::free_array<u2>(_loader_data, _permitted_subclasses);
}
+ if (_preload_classes != nullptr && _preload_classes != Universe::the_empty_short_array()) {
+ MetadataFactory::free_array<u2>(_loader_data, _preload_classes);
+ }
+
// Free interfaces
InstanceKlass::deallocate_interfaces(_loader_data, _super_klass,
_local_interfaces, _transitive_interfaces);
if (_combined_annotations != nullptr) {
assert(cp_size == (u2)cp->length(), "invariant");
// ACCESS FLAGS
stream->guarantee_more(8, CHECK); // flags, this_class, super_class, infs_len
- // Access flags
- jint flags;
+ jint recognized_modifiers = JVM_RECOGNIZED_CLASS_MODIFIERS;
// JVM_ACC_MODULE is defined in JDK-9 and later.
if (_major_version >= JAVA_9_VERSION) {
- flags = stream->get_u2_fast() & (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_MODULE);
- } else {
- flags = stream->get_u2_fast() & JVM_RECOGNIZED_CLASS_MODIFIERS;
+ recognized_modifiers |= JVM_ACC_MODULE;
+ }
+ // JVM_ACC_VALUE and JVM_ACC_PRIMITIVE supported version
+ if (supports_inline_types()) {
+ recognized_modifiers |= JVM_ACC_PRIMITIVE | JVM_ACC_VALUE;
}
+ // Access flags
+ jint flags = stream->get_u2_fast() & recognized_modifiers;
+
if ((flags & JVM_ACC_INTERFACE) && _major_version < JAVA_6_VERSION) {
// Set abstract bit for old class files for backward compatibility
flags |= JVM_ACC_ABSTRACT;
}
- verify_legal_class_modifiers(flags, CHECK);
-
- short bad_constant = class_bad_constant_seen();
- if (bad_constant != 0) {
- // Do not throw CFE until after the access_flags are checked because if
- // ACC_MODULE is set in the access flags, then NCDFE must be thrown, not CFE.
- classfile_parse_error("Unknown constant tag %u in class file %s", bad_constant, THREAD);
- return;
- }
-
- _access_flags.set_flags(flags);
-
// This class and superclass
_this_class_index = stream->get_u2_fast();
check_property(
valid_cp_range(_this_class_index, cp_size) &&
cp->tag_at(_this_class_index).is_unresolved_klass(),
_this_class_index, CHECK);
Symbol* const class_name_in_cp = cp->klass_name_at(_this_class_index);
assert(class_name_in_cp != nullptr, "class_name can't be null");
+ bool is_java_lang_Object = class_name_in_cp == vmSymbols::java_lang_Object();
+
+ verify_legal_class_modifiers(flags, nullptr, is_java_lang_Object, CHECK);
+
+ if (EnableValhalla) {
+ if(!supports_inline_types()) {
+ const bool is_module = (flags & JVM_ACC_MODULE) != 0;
+ const bool is_interface = (flags & JVM_ACC_INTERFACE) != 0;
+ if (!is_module && !is_interface && !is_java_lang_Object) {
+ flags |= JVM_ACC_IDENTITY;
+ }
+ }
+ }
+
+ _access_flags.set_flags(flags);
+
+ if (EnableValhalla) {
+ if (_access_flags.is_identity_class()) set_carries_identity_modifier();
+ if (_access_flags.is_value_class()) set_carries_value_modifier();
+ if (carries_identity_modifier() && carries_value_modifier()) {
+ classfile_parse_error("Class %s has both ACC_IDENTITY and ACC_VALUE modifiers", THREAD);
+ }
+ }
+
+ short bad_constant = class_bad_constant_seen();
+ if (bad_constant != 0) {
+ // Do not throw CFE until after the access_flags are checked because if
+ // ACC_MODULE is set in the access flags, then NCDFE must be thrown, not CFE.
+ classfile_parse_error("Unknown constant tag %u in class file %s", bad_constant, THREAD);
+ return;
+ }
+
// Don't need to check whether this class name is legal or not.
// It has been checked when constant pool is parsed.
// However, make sure it is not an array type.
if (_need_verify) {
guarantee_property(class_name_in_cp->char_at(0) != JVM_SIGNATURE_ARRAY,
_itfs_len = stream->get_u2_fast();
parse_interfaces(stream,
_itfs_len,
cp,
&_has_nonstatic_concrete_methods,
+ &_is_declared_atomic,
CHECK);
- assert(_local_interfaces != nullptr, "invariant");
-
// Fields (offsets are filled in later)
_fac = new FieldAllocationCount();
parse_fields(stream,
- _access_flags.is_interface(),
+ _access_flags,
_fac,
cp,
cp_size,
&_java_fields_count,
CHECK);
assert(_temp_field_info != nullptr, "invariant");
// Methods
parse_methods(stream,
- _access_flags.is_interface(),
+ is_interface(),
+ is_value_class(),
+ is_abstract_class(),
&_has_localvariable_table,
&_has_final_method,
&_declares_nonstatic_concrete_methods,
CHECK);
assert(cp != nullptr, "invariant");
assert(_loader_data != nullptr, "invariant");
if (_class_name == vmSymbols::java_lang_Object()) {
check_property(_local_interfaces == Universe::the_empty_instance_klass_array(),
- "java.lang.Object cannot implement an interface in class file %s",
- CHECK);
+ "java.lang.Object cannot implement an interface in class file %s",
+ CHECK);
}
// We check super class after class file is parsed and format is checked
if (_super_class_index > 0 && nullptr == _super_klass) {
Symbol* const super_class_name = cp->klass_name_at(_super_class_index);
- if (_access_flags.is_interface()) {
+ if (is_interface()) {
// Before attempting to resolve the superclass, check for class format
// errors not checked yet.
guarantee_property(super_class_name == vmSymbols::java_lang_Object(),
"Interfaces must have java.lang.Object as superclass in class file %s",
CHECK);
CHECK);
}
}
if (_super_klass != nullptr) {
+ if (_super_klass->is_interface()) {
+ classfile_icce_error("class %s has interface %s as super class", _super_klass, THREAD);
+ return;
+ }
+
+ if (EnableValhalla) {
+ check_identity_and_value_modifiers(this, _super_klass, CHECK);
+ }
+
if (_super_klass->has_nonstatic_concrete_methods()) {
_has_nonstatic_concrete_methods = true;
}
+ if (_super_klass->is_declared_atomic()) {
+ _is_declared_atomic = true;
+ }
+ }
- if (_super_klass->is_interface()) {
- classfile_icce_error("class %s has interface %s as super class", _super_klass, THREAD);
- return;
+ if (*ForceNonTearable != '\0') {
+ // Allow a command line switch to force the same atomicity property:
+ const char* class_name_str = _class_name->as_C_string();
+ if (StringUtils::class_list_match(ForceNonTearable, class_name_str)) {
+ _is_declared_atomic = true;
+ }
+ }
+
+ int itfs_len = _local_interface_indexes == nullptr ? 0 : _local_interface_indexes->length();
+ _local_interfaces = MetadataFactory::new_array<InstanceKlass*>(_loader_data, itfs_len, nullptr, CHECK);
+ if (_local_interface_indexes != nullptr) {
+ for (int i = 0; i < _local_interface_indexes->length(); i++) {
+ u2 interface_index = _local_interface_indexes->at(i);
+ Klass* interf;
+ if (cp->tag_at(interface_index).is_klass()) {
+ interf = cp->resolved_klass_at(interface_index);
+ } else {
+ Symbol* const unresolved_klass = cp->klass_name_at(interface_index);
+
+ // Don't need to check legal name because it's checked when parsing constant pool.
+ // But need to make sure it's not an array type.
+ guarantee_property(unresolved_klass->char_at(0) != JVM_SIGNATURE_ARRAY,
+ "Bad interface name in class file %s", CHECK);
+
+ // Call resolve_super so class circularity is checked
+ interf = SystemDictionary::resolve_super_or_fail(
+ _class_name,
+ unresolved_klass,
+ Handle(THREAD, _loader_data->class_loader()),
+ _protection_domain,
+ false,
+ CHECK);
+ }
+
+ if (!interf->is_interface()) {
+ THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
+ err_msg("class %s can not implement %s, because it is not an interface (%s)",
+ _class_name->as_klass_external_name(),
+ interf->external_name(),
+ interf->class_in_module_of_loader()));
+ }
+
+ if (EnableValhalla) {
+ // Check modifiers and set carries_identity_modifier/carries_value_modifier flags
+ check_identity_and_value_modifiers(this, InstanceKlass::cast(interf), CHECK);
+ }
+
+ if (InstanceKlass::cast(interf)->has_nonstatic_concrete_methods()) {
+ _has_nonstatic_concrete_methods = true;
+ }
+ if (InstanceKlass::cast(interf)->is_declared_atomic()) {
+ _is_declared_atomic = true;
+ }
+ _local_interfaces->at_put(i, InstanceKlass::cast(interf));
}
}
+ assert(_local_interfaces != nullptr, "invariant");
// Compute the transitive list of all unique interfaces implemented by this class
_transitive_interfaces =
compute_transitive_interfaces(_super_klass,
_local_interfaces,
loader,
_class_name,
_local_interfaces);
// Size of Java itable (in words)
- _itable_size = _access_flags.is_interface() ? 0 :
+ _itable_size = is_interface() ? 0 :
klassItable::compute_itable_size(_transitive_interfaces);
assert(_fac != nullptr, "invariant");
assert(_parsed_annotations != nullptr, "invariant");
+
+ if (EnablePrimitiveClasses) {
+ _inline_type_field_klasses = MetadataFactory::new_array<InlineKlass*>(_loader_data,
+ java_fields_count(),
+ nullptr,
+ CHECK);
+ for (GrowableArrayIterator<FieldInfo> it = _temp_field_info->begin(); it != _temp_field_info->end(); ++it) {
+ FieldInfo fieldinfo = *it;
+ Symbol* sig = fieldinfo.signature(cp);
+
+ if (fieldinfo.field_flags().is_null_free_inline_type() && !fieldinfo.access_flags().is_static()) {
+ // Pre-load inline class
+ Klass* klass = SystemDictionary::resolve_inline_type_field_or_fail(sig,
+ Handle(THREAD, _loader_data->class_loader()),
+ _protection_domain, true, CHECK);
+ assert(klass != nullptr, "Sanity check");
+ if (!klass->access_flags().is_value_class()) {
+ assert(klass->is_instance_klass(), "Sanity check");
+ ResourceMark rm(THREAD);
+ THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
+ err_msg("Class %s expects class %s to be an inline type, but it is not",
+ _class_name->as_C_string(),
+ InstanceKlass::cast(klass)->external_name()));
+ }
+ _inline_type_field_klasses->at_put(fieldinfo.index(), InlineKlass::cast(klass));
+ }
+ }
+ }
+
_field_info = new FieldLayoutInfo();
FieldLayoutBuilder lb(class_name(), super_klass(), _cp, /*_fields*/ _temp_field_info,
- _parsed_annotations->is_contended(), _field_info);
- lb.build_layout();
+ _parsed_annotations->is_contended(), is_inline_type(),
+ _field_info, _inline_type_field_klasses);
+ lb.build_layout(CHECK);
+ if (is_inline_type()) {
+ _alignment = lb.get_alignment();
+ _first_field_offset = lb.get_first_field_offset();
+ _exact_size_in_bytes = lb.get_exact_size_in_byte();
+ }
+ _has_inline_type_fields = _field_info->_has_inline_fields;
int injected_fields_count = _temp_field_info->length() - _java_fields_count;
_fieldinfo_stream =
FieldInfoStream::create_FieldInfoStream(_temp_field_info, _java_fields_count,
injected_fields_count, loader_data(), CHECK);
< prev index next >