hg: jdk8u/hs-dev/hotspot: 2 new changesets

[harold.seigel at oracle.com]

Changeset: 386dd1c71858
Author:    lfoltan
Date:      2014-04-14 14:27 -0400
URL:       http://hg.openjdk.java.net/jdk8u/hs-dev/hotspot/rev/386dd1c71858

8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
Summary: A static method should be preferred during method resolution over an overpass, search the current class as well as its superclasses.
Reviewed-by: acorn, coleenp, kamg

! src/share/vm/classfile/defaultMethods.cpp
! src/share/vm/classfile/verifier.cpp
! src/share/vm/interpreter/linkResolver.cpp
! src/share/vm/oops/arrayKlass.cpp
! src/share/vm/oops/arrayKlass.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/klass.cpp
! src/share/vm/oops/klass.hpp
! src/share/vm/oops/klassVtable.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/nativeLookup.cpp

Changeset: cfde111a2f20
Author:    hseigel
Date:      2014-04-17 17:35 -0400
URL:       http://hg.openjdk.java.net/jdk8u/hs-dev/hotspot/rev/cfde111a2f20

Merge