comparison src/share/vm/classfile/classFileParser.cpp @ 13451:02f27ecb4f3a

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 00:00:24 +0100
parents 096c224171c4 19146c82b6fc
children d8041d695d19
comparison
equal deleted inserted replaced
13371:4db09b7304da 13451:02f27ecb4f3a
4481 4481
4482 // go thru each method and check if it overrides a final method 4482 // go thru each method and check if it overrides a final method
4483 for (int index = 0; index < num_methods; index++) { 4483 for (int index = 0; index < num_methods; index++) {
4484 Method* m = methods->at(index); 4484 Method* m = methods->at(index);
4485 4485
4486 // skip static and <init> methods 4486 // skip private, static, and <init> methods
4487 if ((!m->is_static()) && 4487 if ((!m->is_private() && !m->is_static()) &&
4488 (m->name() != vmSymbols::object_initializer_name())) { 4488 (m->name() != vmSymbols::object_initializer_name())) {
4489 4489
4490 Symbol* name = m->name(); 4490 Symbol* name = m->name();
4491 Symbol* signature = m->signature(); 4491 Symbol* signature = m->signature();
4492 Klass* k = this_klass->super(); 4492 Klass* k = this_klass->super();