Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/oop.hpp	Fri Jan 18 05:33:32 2013 -0800
     1.2 +++ b/src/share/vm/oops/oop.hpp	Wed Jan 23 13:02:39 2013 -0500
     1.3 @@ -29,6 +29,7 @@
     1.4  #include "memory/memRegion.hpp"
     1.5  #include "memory/specialized_oop_closures.hpp"
     1.6  #include "oops/metadata.hpp"
     1.7 +#include "utilities/macros.hpp"
     1.8  #include "utilities/top.hpp"
     1.9  
    1.10  // oopDesc is the top baseclass for objects classes.  The {name}Desc classes describe
    1.11 @@ -298,7 +299,7 @@
    1.12    // reference field in "this".
    1.13    void follow_contents(void);
    1.14  
    1.15 -#ifndef SERIALGC
    1.16 +#if INCLUDE_ALL_GCS
    1.17    // Parallel Scavenge
    1.18    void push_contents(PSPromotionManager* pm);
    1.19  
    1.20 @@ -306,7 +307,7 @@
    1.21    void update_contents(ParCompactionManager* cm);
    1.22  
    1.23    void follow_contents(ParCompactionManager* cm);
    1.24 -#endif // SERIALGC
    1.25 +#endif // INCLUDE_ALL_GCS
    1.26  
    1.27    bool is_scavengable() const;
    1.28  
    1.29 @@ -316,13 +317,13 @@
    1.30    void forward_to(oop p);
    1.31    bool cas_forward_to(oop p, markOop compare);
    1.32  
    1.33 -#ifndef SERIALGC
    1.34 +#if INCLUDE_ALL_GCS
    1.35    // Like "forward_to", but inserts the forwarding pointer atomically.
    1.36    // Exactly one thread succeeds in inserting the forwarding pointer, and
    1.37    // this call returns "NULL" for that thread; any other thread has the
    1.38    // value of the forwarding pointer returned and does not modify "this".
    1.39    oop forward_to_atomic(oop p);
    1.40 -#endif // SERIALGC
    1.41 +#endif // INCLUDE_ALL_GCS
    1.42  
    1.43    oop forwardee() const;
    1.44  
    1.45 @@ -334,10 +335,10 @@
    1.46    // return the size of this oop.  This is used by the MarkSweep collector.
    1.47    int adjust_pointers();
    1.48  
    1.49 -#ifndef SERIALGC
    1.50 +#if INCLUDE_ALL_GCS
    1.51    // Parallel old
    1.52    void update_header(ParCompactionManager* cm);
    1.53 -#endif // SERIALGC
    1.54 +#endif // INCLUDE_ALL_GCS
    1.55  
    1.56    // mark-sweep support
    1.57    void follow_body(int begin, int end);
    1.58 @@ -354,7 +355,7 @@
    1.59    ALL_OOP_OOP_ITERATE_CLOSURES_1(OOP_ITERATE_DECL)
    1.60    ALL_OOP_OOP_ITERATE_CLOSURES_2(OOP_ITERATE_DECL)
    1.61  
    1.62 -#ifndef SERIALGC
    1.63 +#if INCLUDE_ALL_GCS
    1.64  
    1.65  #define OOP_ITERATE_BACKWARDS_DECL(OopClosureType, nv_suffix)            \
    1.66    int oop_iterate_backwards(OopClosureType* blk);