hg: hsx/hotspot-comp/hotspot: 8027572: assert(r != 0) failed: invalid

[roland.westrelin at oracle.com]

Changeset: 6e1826d5c23e
Author:    roland
Date:      2013-11-13 13:45 +0100
URL:       http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot/rev/6e1826d5c23e

8027572: assert(r != 0) failed: invalid
Summary: null classes should be expected in profiles with conflicts
Reviewed-by: kvn, iveresov

! src/share/vm/ci/ciMethodData.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/methodData.cpp
! src/share/vm/oops/methodData.hpp
+ test/compiler/profiling/unloadingconflict/B.java
+ test/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java