Mercurial > hg > graal-compiler
diff src/share/vm/classfile/classFileParser.cpp @ 17577:f0d759a6a230 jdk8u11-b01
8037167: Better method signature resolution
Reviewed-by: mschoene, hseigel, lfoltan
| author | acorn |
|---|---|
| date | Thu, 20 Mar 2014 11:36:40 -0700 |
| parents | 5f7e12f5b4e5 |
| children | 3eed8712d410 364b73402247 3b0fe4ec6ebe |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Thu Mar 20 10:06:22 2014 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Thu Mar 20 11:36:40 2014 -0700 @@ -931,7 +931,7 @@ "Wrong size %u for field's Signature attribute in class file %s", attribute_length, CHECK); } - generic_signature_index = cfs->get_u2(CHECK); + generic_signature_index = parse_generic_signature_attribute(CHECK); } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) { runtime_visible_annotations_length = attribute_length; runtime_visible_annotations = cfs->get_u1_buffer(); @@ -2305,8 +2305,7 @@ "Invalid Signature attribute length %u in class file %s", method_attribute_length, CHECK_(nullHandle)); } - cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index - generic_signature_index = cfs->get_u2_fast(); + generic_signature_index = parse_generic_signature_attribute(CHECK_(nullHandle)); } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) { runtime_visible_annotations_length = method_attribute_length; runtime_visible_annotations = cfs->get_u1_buffer(); @@ -2616,6 +2615,17 @@ return method_ordering; } +// Parse generic_signature attribute for methods and fields +u2 ClassFileParser::parse_generic_signature_attribute(TRAPS) { + ClassFileStream* cfs = stream(); + cfs->guarantee_more(2, CHECK_0); // generic_signature_index + u2 generic_signature_index = cfs->get_u2_fast(); + check_property( + valid_symbol_at(generic_signature_index), + "Invalid Signature attribute at constant pool index %u in class file %s", + generic_signature_index, CHECK_0); + return generic_signature_index; +} void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) { ClassFileStream* cfs = stream();