Mercurial > hg > graal-compiler
comparison src/share/vm/oops/klassPS.hpp @ 8002:8391fdd36e1f
Merge
author | dlong |
---|---|
date | Sun, 27 Jan 2013 01:07:09 -0800 |
parents | db9981fd3124 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
7946:6fbe8a57549d | 8002:8391fdd36e1f |
---|---|
25 #ifndef SHARE_VM_OOPS_KLASSPS_HPP | 25 #ifndef SHARE_VM_OOPS_KLASSPS_HPP |
26 #define SHARE_VM_OOPS_KLASSPS_HPP | 26 #define SHARE_VM_OOPS_KLASSPS_HPP |
27 | 27 |
28 // Expands to Parallel Scavenge and Parallel Old declarations | 28 // Expands to Parallel Scavenge and Parallel Old declarations |
29 | 29 |
30 #ifndef SERIALGC | 30 #include "utilities/macros.hpp" |
31 | |
32 #if INCLUDE_ALL_GCS | |
31 #define PARALLEL_GC_DECLS \ | 33 #define PARALLEL_GC_DECLS \ |
32 virtual void oop_push_contents(PSPromotionManager* pm, oop obj); \ | 34 virtual void oop_push_contents(PSPromotionManager* pm, oop obj); \ |
33 /* Parallel Old GC support \ | 35 /* Parallel Old GC support \ |
34 \ | 36 \ |
35 The 2-arg version of oop_update_pointers is for objects that are \ | 37 The 2-arg version of oop_update_pointers is for objects that are \ |
42 // Pure virtual version for klass.hpp | 44 // Pure virtual version for klass.hpp |
43 #define PARALLEL_GC_DECLS_PV \ | 45 #define PARALLEL_GC_DECLS_PV \ |
44 virtual void oop_push_contents(PSPromotionManager* pm, oop obj) = 0; \ | 46 virtual void oop_push_contents(PSPromotionManager* pm, oop obj) = 0; \ |
45 virtual void oop_follow_contents(ParCompactionManager* cm, oop obj) = 0; \ | 47 virtual void oop_follow_contents(ParCompactionManager* cm, oop obj) = 0; \ |
46 virtual int oop_update_pointers(ParCompactionManager* cm, oop obj) = 0; | 48 virtual int oop_update_pointers(ParCompactionManager* cm, oop obj) = 0; |
47 #else // SERIALGC | 49 #else // INCLUDE_ALL_GCS |
48 #define PARALLEL_GC_DECLS | 50 #define PARALLEL_GC_DECLS |
49 #define PARALLEL_GC_DECLS_PV | 51 #define PARALLEL_GC_DECLS_PV |
50 #endif // SERIALGC | 52 #endif // INCLUDE_ALL_GCS |
51 | 53 |
52 #endif // SHARE_VM_OOPS_KLASSPS_HPP | 54 #endif // SHARE_VM_OOPS_KLASSPS_HPP |