Mercurial > hg > truffle
diff src/share/vm/runtime/vmStructs.cpp @ 18125:2a69cbe850a8
Reduce diff with upstream
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Mon, 20 Oct 2014 19:07:20 +0200 |
| parents | 3498d73280c8 |
| children | 8f2fb6bec986 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -160,7 +160,6 @@ #ifdef TARGET_OS_ARCH_bsd_zero # include "vmStructs_bsd_zero.hpp" #endif - #if INCLUDE_ALL_GCS #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" @@ -404,8 +403,8 @@ nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ volatile_nonstatic_field(Symbol, _refcount, short) \ + nonstatic_field(Symbol, _identity_hash, int) \ nonstatic_field(Symbol, _length, unsigned short) \ - nonstatic_field(Symbol, _identity_hash, int) \ unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ nonstatic_field(Symbol, _body[0], jbyte) \ nonstatic_field(TypeArrayKlass, _max_length, int) \ @@ -1346,6 +1345,7 @@ nonstatic_field(FreeList<Metablock>, _count, ssize_t) \ nonstatic_field(MetablockTreeDictionary, _total_size, size_t) + //-------------------------------------------------------------------------------- // VM_TYPES //