hg: hsx/hotspot-rt/hotspot: 8015270: @Contended: fix multiple issues in the layout code

[daniel.daugherty at oracle.com]

Changeset: 3970971c91e0
Author:    shade
Date:      2013-05-27 12:49 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/3970971c91e0

8015270: @Contended: fix multiple issues in the layout code
Summary: field count handling fixed, has_nonstatic_fields invariant fixed, oop map overrun fixed; new asserts
Reviewed-by: kvn, dcubed, coleenp

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/contended/HasNonStatic.java
+ test/runtime/contended/OopMaps.java