RFR (XS) JDK-8051002: Incorrectly merged share/vm/classfile/classFileParser.cpp was pushed to 8u20

[Christian Tornqvist]

Hi Lois,

This looks good, thanks for fixing this.

Thanks,
Christian

-----Original Message-----
From: hotspot-runtime-dev [mailto:hotspot-runtime-dev-bounces at openjdk.java.net] On Behalf Of Lois Foltan
Sent: Friday, August 22, 2014 2:14 PM
To: hotspot-runtime-dev
Subject: RFR (XS) JDK-8051002: Incorrectly merged share/vm/classfile/classFileParser.cpp was pushed to 8u20

Hi Everyone,

Please review the following fix targeted specifically for 8u.

Webrev:
     http://cr.openjdk.java.net/~lfoltan/bug_jdk8051002/

Bug: Incorrectly merged share/vm/classfile/classFileParser.cpp was pushed to 8u20
     https://bugs.openjdk.java.net/browse/JDK-8051002

Summary of fix:
Incorrect JDK 8u merge of classfile/classFileParser.cpp resulted in a duplicate call to check the attribute_byte_length within ClassFileParser::parse_classfile_bootstrap_methods_attribute().  The first call did not reflect the fixed condition check and resulted in the failure of test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java. This change fixes the condition check and removes the duplicate call to guarantee_property.

Testing:
     vm.quick.testlist, Hotspot's full jtreg tests

Thanks,
Lois