hg: jdk9/hs-rt/hotspot: 2 new changesets

[dmitry.samersoff at oracle.com]

Changeset: c597dc3eb862
Author:    dsamersoff
Date:      2014-05-28 07:36 -0700
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/c597dc3eb862

6904403: assert(f == k->has_finalizer(),"inconsistent has_finalizer") with debug VM
Summary: Don't assert if one of classes in hierarhy was redefined
Reviewed-by: coleenp, sspitsyn

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
+ test/runtime/RedefineFinalizer/Agent.java
+ test/runtime/RedefineFinalizer/Main.java
+ test/runtime/RedefineFinalizer/Martyr.java
+ test/runtime/RedefineFinalizer/MartyrSon.java
+ test/runtime/RedefineFinalizer/manifest.mf
+ test/runtime/RedefineFinalizer/testme.sh

Changeset: c351f64e8468
Author:    dsamersoff
Date:      2014-05-28 15:03 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/c351f64e8468

Merge