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

[harold.seigel at oracle.com]

Changeset: 2e7b5143763f
Author:    hseigel
Date:      2014-01-24 08:13 -0500
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/2e7b5143763f

8028553: The JVM should not throw VerifyError when 'overriding' a static final method in a superclass.
Summary: Check if method is static before throwing exception.
Reviewed-by: kamg, coleenp, lfoltan, fparain

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/finalStatic/FinalStatic.java

Changeset: 7327ec5e661e
Author:    hseigel
Date:      2014-01-24 08:31 -0500
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/7327ec5e661e

Merge