jdk-sandbox: comparison src/hotspot/share/classfile/classFileParser.cpp

equal deleted inserted replaced

-:ae0af9fb3dbb
+:cba8afa5cfed
 }
 // 4509014: If a class method name begins with '<', it must be "<init>"
 const unsigned int name_len = name->utf8_length();
 if (tag == JVM_CONSTANT_Methodref &&
 name_len != 0 &&
-name->char_at(0) == '<' &&
+name->char_at(0) == JVM_SIGNATURE_SPECIAL &&
 name != vmSymbols::object_initializer_name()) {
 classfile_parse_error(
 "Bad method name at constant pool index %u in class file %s",
 name_ref_index, CHECK);
 }
 unsigned int length,
 int type) {
 if (length == 0) return false;  // Must have at least one char.
 for (const char* p = name; p != name + length; p++) {
 switch(*p) {
-case '.':
+case JVM_SIGNATURE_DOT:
-case ';':
+case JVM_SIGNATURE_ENDCLASS:
-case '[':
+case JVM_SIGNATURE_ARRAY:
 // do not permit '.', ';', or '['
 return false;
-case '/':
+case JVM_SIGNATURE_SLASH:
 // check for '//' or leading or trailing '/' which are not legal
 // unqualified name must not be empty
 if (type == ClassFileParser::LegalClass) {
-if (p == name || p+1 >= name+length || *(p+1) == '/') {
+if (p == name || p+1 >= name+length ||
+*(p+1) == JVM_SIGNATURE_SLASH) {
 return false;
 }
 } else {
 return false;   // do not permit '/' unless it's class name
 }
 break;
-case '<':
+case JVM_SIGNATURE_SPECIAL:
-case '>':
+case JVM_SIGNATURE_ENDSPECIAL:
 // do not permit '<' or '>' in method names
 if (type == ClassFileParser::LegalMethod) {
 return false;
 }
 }
 (ch == '_' || ch == '$') ||
 (not_first_ch && ch >= '0' && ch <= '9')) {
 last_is_slash = false;
 continue;
 }
-if (slash_ok && ch == '/') {
+if (slash_ok && ch == JVM_SIGNATURE_SLASH) {
 if (last_is_slash) {
 return NULL;  // Don't permit consecutive slashes
 }
 last_is_slash = true;
 continue;
 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] == ';') {
+if (p && (p - signature) > 1 && p[0] == JVM_SIGNATURE_ENDCLASS) {
 return p + 1;
 }
 }
 else {
 // Skip leading 'L' and ignore first appearance of ';'
 signature++;
-const char* c = (const char*) memchr(signature, ';', length - 1);
+const char* c = (const char*) memchr(signature, JVM_SIGNATURE_ENDCLASS, length - 1);
 // Format check signature
 if (c != NULL) {
 int newlen = c - (char*) signature;
 bool legal = verify_unqualified_name(signature, newlen, LegalClass);
 if (!legal) {
 const char* p;
 if (bytes[0] == JVM_SIGNATURE_ARRAY) {
 p = skip_over_field_signature(bytes, false, length, CHECK);
 legal = (p != NULL) && ((p - bytes) == (int)length);
 } else if (_major_version < JAVA_1_5_VERSION) {
-if (bytes[0] != '<') {
+if (bytes[0] != JVM_SIGNATURE_SPECIAL) {
 p = skip_over_field_name(bytes, true, length);
 legal = (p != NULL) && ((p - bytes) == (int)length);
 }
 } else {
 // 4900761: relax the constraints based on JSR202 spec
 unsigned int length = name->utf8_length();
 bool legal = false;
 if (length > 0) {
 if (_major_version < JAVA_1_5_VERSION) {
-if (bytes[0] != '<') {
+if (bytes[0] != JVM_SIGNATURE_SPECIAL) {
 const char* p = skip_over_field_name(bytes, false, length);
 legal = (p != NULL) && ((p - bytes) == (int)length);
 }
 } else {
 // 4881221: relax the constraints based on JSR202 spec
 char* bytes = (char*)name->bytes();
 unsigned int length = name->utf8_length();
 bool legal = false;
 if (length > 0) {
-if (bytes[0] == '<') {
+if (bytes[0] == JVM_SIGNATURE_SPECIAL) {
 if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) {
 legal = true;
 }
 } else if (_major_version < JAVA_1_5_VERSION) {
 const char* p;
 nextp = skip_over_field_signature(p, false, length, CHECK_0);
 }
 // The first non-signature thing better be a ')'
 if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) {
 length--;
-if (name->utf8_length() > 0 && name->char_at(0) == '<') {
+if (name->utf8_length() > 0 && name->char_at(0) == JVM_SIGNATURE_SPECIAL) {
 // All internal methods must return void
 if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) {
 return args_size;
 }
 } else {
 // For an unsafe anonymous class that is in the unnamed package, move it to its host class's
 // package by prepending its host class's package name to its class name and setting
 // its _class_name field.
 void ClassFileParser::prepend_host_package_name(const InstanceKlass* unsafe_anonymous_host, TRAPS) {
 ResourceMark rm(THREAD);
-assert(strrchr(_class_name->as_C_string(), '/') == NULL,
+assert(strrchr(_class_name->as_C_string(), JVM_SIGNATURE_SLASH) == NULL,
 "Unsafe anonymous class should not be in a package");
 const char* host_pkg_name =
 ClassLoader::package_from_name(unsafe_anonymous_host->name()->as_C_string(), NULL);
 if (host_pkg_name != NULL) {
 // exception.
 void ClassFileParser::fix_unsafe_anonymous_class_name(TRAPS) {
 assert(_unsafe_anonymous_host != NULL, "Expected an unsafe anonymous class");
 const jbyte* anon_last_slash = UTF8::strrchr((const jbyte*)_class_name->base(),
-_class_name->utf8_length(), '/');
+_class_name->utf8_length(), JVM_SIGNATURE_SLASH);
 if (anon_last_slash == NULL) {  // Unnamed package
 prepend_host_package_name(_unsafe_anonymous_host, CHECK);
 } else {
 if (!_unsafe_anonymous_host->is_same_class_package(_unsafe_anonymous_host->class_loader(), _class_name)) {
 ResourceMark rm(THREAD);
 // return true if class_name contains no '.' (internal format is '/')
 bool ClassFileParser::is_internal_format(Symbol* class_name) {
 if (class_name != NULL) {
 ResourceMark rm;
 char* name = class_name->as_C_string();
-return strchr(name, '.') == NULL;
+return strchr(name, JVM_SIGNATURE_DOT) == NULL;
 } else {
 return true;
 }
 }

changeset 58722	cba8afa5cfed
parent 58447	319173c62caa
child 58817	7f27d70a2424