hg: hsx/hotspot-rt/hotspot: 8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.

[karen.kinnear at oracle.com]

Changeset: 36b97be47bde
Author:    acorn
Date:      2013-10-01 08:10 -0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/36b97be47bde

8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
Reviewed-by: coleenp, bharadwaj, minqi

! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/defaultMethods.cpp
! src/share/vm/classfile/defaultMethods.hpp
! src/share/vm/interpreter/linkResolver.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/klassVtable.cpp