Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 14392:b5c8a61d7fa0
Merge
| author | kvn |
|---|---|
| date | Fri, 21 Jun 2013 15:56:24 -0700 |
| parents | d2907f74462e f2110083203d |
| children | 583211d4b16b |
comparison
equal
deleted
inserted
replaced
| 14391:d2907f74462e | 14392:b5c8a61d7fa0 |
|---|---|
| 58 #include "memory/genCollectedHeap.hpp" | 58 #include "memory/genCollectedHeap.hpp" |
| 59 #include "memory/generation.hpp" | 59 #include "memory/generation.hpp" |
| 60 #include "memory/generationSpec.hpp" | 60 #include "memory/generationSpec.hpp" |
| 61 #include "memory/heap.hpp" | 61 #include "memory/heap.hpp" |
| 62 #include "memory/metablock.hpp" | 62 #include "memory/metablock.hpp" |
| 63 #include "memory/referenceType.hpp" | |
| 63 #include "memory/space.hpp" | 64 #include "memory/space.hpp" |
| 64 #include "memory/tenuredGeneration.hpp" | 65 #include "memory/tenuredGeneration.hpp" |
| 65 #include "memory/universe.hpp" | 66 #include "memory/universe.hpp" |
| 66 #include "memory/watermark.hpp" | 67 #include "memory/watermark.hpp" |
| 67 #include "oops/arrayKlass.hpp" | 68 #include "oops/arrayKlass.hpp" |
| 293 nonstatic_field(InstanceKlass, _methods, Array<Method*>*) \ | 294 nonstatic_field(InstanceKlass, _methods, Array<Method*>*) \ |
| 294 nonstatic_field(InstanceKlass, _local_interfaces, Array<Klass*>*) \ | 295 nonstatic_field(InstanceKlass, _local_interfaces, Array<Klass*>*) \ |
| 295 nonstatic_field(InstanceKlass, _transitive_interfaces, Array<Klass*>*) \ | 296 nonstatic_field(InstanceKlass, _transitive_interfaces, Array<Klass*>*) \ |
| 296 nonstatic_field(InstanceKlass, _fields, Array<u2>*) \ | 297 nonstatic_field(InstanceKlass, _fields, Array<u2>*) \ |
| 297 nonstatic_field(InstanceKlass, _java_fields_count, u2) \ | 298 nonstatic_field(InstanceKlass, _java_fields_count, u2) \ |
| 298 nonstatic_field(InstanceKlass, _constants, ConstantPool*) \ | 299 nonstatic_field(InstanceKlass, _constants, ConstantPool*) \ |
| 299 nonstatic_field(InstanceKlass, _class_loader_data, ClassLoaderData*) \ | 300 nonstatic_field(InstanceKlass, _class_loader_data, ClassLoaderData*) \ |
| 300 nonstatic_field(InstanceKlass, _protection_domain, oop) \ | |
| 301 nonstatic_field(InstanceKlass, _signers, objArrayOop) \ | |
| 302 nonstatic_field(InstanceKlass, _source_file_name, Symbol*) \ | 301 nonstatic_field(InstanceKlass, _source_file_name, Symbol*) \ |
| 303 nonstatic_field(InstanceKlass, _source_debug_extension, char*) \ | 302 nonstatic_field(InstanceKlass, _source_debug_extension, char*) \ |
| 304 nonstatic_field(InstanceKlass, _inner_classes, Array<jushort>*) \ | 303 nonstatic_field(InstanceKlass, _inner_classes, Array<jushort>*) \ |
| 305 nonstatic_field(InstanceKlass, _nonstatic_field_size, int) \ | 304 nonstatic_field(InstanceKlass, _nonstatic_field_size, int) \ |
| 306 nonstatic_field(InstanceKlass, _static_field_size, int) \ | 305 nonstatic_field(InstanceKlass, _static_field_size, int) \ |