8223767: Shenandoah fails to build on Solaris x86_64

Trivial changes to make Solaris Studio 12.4 happy

Reviewed-by: shade, rkennke
This commit is contained in:
Boris Ulasevich 2019-05-14 21:36:09 +03:00 committed by Dmitry Samersoff
parent 204059634d
commit 09a10b75de
12 changed files with 25 additions and 24 deletions

View file

@ -43,7 +43,7 @@ private:
ShenandoahStore,
ShenandoahValue,
ShenandoahOopStore,
ShenandoahNone,
ShenandoahNone
};
static bool verify_helper(Node* in, Node_Stack& phis, VectorSet& visited, verify_type t, bool trace, Unique_Node_List& barriers_used);

View file

@ -33,7 +33,7 @@ public:
_alloc_shared_gc, // Allocate common, outside of GCLAB
_alloc_tlab, // Allocate TLAB
_alloc_gclab, // Allocate GCLAB
_ALLOC_LIMIT,
_ALLOC_LIMIT
};
static const char* alloc_type_to_string(Type type) {

View file

@ -35,7 +35,7 @@ public:
_safe_unknown,
_safe_oop,
_safe_oop_fwd,
_safe_all,
_safe_all
};
static void print_obj(ShenandoahMessageBuffer &msg, oop obj);

View file

@ -32,12 +32,13 @@
class ShenandoahBarrierSetAssembler;
class ShenandoahBarrierSet: public BarrierSet {
private:
public:
enum ArrayCopyStoreValMode {
NONE,
READ_BARRIER,
WRITE_BARRIER
};
private:
ShenandoahHeap* _heap;
ShenandoahSATBMarkQueueSet _satb_mark_queue_set;

View file

@ -59,7 +59,7 @@ private:
concurrent_traversal,
concurrent_normal,
stw_degenerated,
stw_full,
stw_full
} GCMode;
// While we could have a single lock for these, it may risk unblocking

View file

@ -244,7 +244,7 @@ public:
UPDATEREFS_BITPOS = 3,
// Heap is under traversal collection
TRAVERSAL_BITPOS = 4,
TRAVERSAL_BITPOS = 4
};
enum GCState {
@ -253,7 +253,7 @@ public:
MARKING = 1 << MARKING_BITPOS,
EVACUATION = 1 << EVACUATION_BITPOS,
UPDATEREFS = 1 << UPDATEREFS_BITPOS,
TRAVERSAL = 1 << TRAVERSAL_BITPOS,
TRAVERSAL = 1 << TRAVERSAL_BITPOS
};
private:
@ -303,7 +303,7 @@ public:
_degenerated_mark,
_degenerated_evac,
_degenerated_updaterefs,
_DEGENERATED_LIMIT,
_DEGENERATED_LIMIT
};
static const char* degen_point_to_string(ShenandoahDegenPoint point) {

View file

@ -114,7 +114,7 @@ private:
_cset, // region is in collection set
_pinned, // region is pinned
_pinned_cset, // region is pinned and in cset (evac failure path)
_trash, // region contains only trash
_trash // region contains only trash
};
const char* region_state_to_string(RegionState s) const {

View file

@ -39,7 +39,7 @@ private:
enum PrivateConstants {
ValBuckets = 512,
MagBuckets = 24,
MagMinimum = -12,
MagMinimum = -12
};
int** _hdr;

View file

@ -41,7 +41,7 @@ enum UpdateRefsMode {
enum StringDedupMode {
NO_DEDUP, // Do not do anything for String deduplication
ENQUEUE_DEDUP, // Enqueue candidate Strings for deduplication
ENQUEUE_DEDUP // Enqueue candidate Strings for deduplication
};
class ShenandoahMarkRefsSuperClosure : public MetadataVisitingOopIterateClosure {

View file

@ -35,7 +35,7 @@ STATIC_ASSERT(sizeof(ShenandoahSharedValue) == 1);
typedef struct ShenandoahSharedFlag {
enum {
UNSET = 0,
SET = 1,
SET = 1
};
DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile ShenandoahSharedValue));
@ -62,8 +62,8 @@ typedef struct ShenandoahSharedFlag {
return OrderAccess::load_acquire(&value) == UNSET;
}
void set_cond(bool value) {
if (value) {
void set_cond(bool val) {
if (val) {
set();
} else {
unset();
@ -167,8 +167,8 @@ typedef struct ShenandoahSharedBitmap {
return (OrderAccess::load_acquire(&value)) == 0;
}
void set_cond(uint mask, bool value) {
if (value) {
void set_cond(uint mask, bool val) {
if (val) {
set(mask);
} else {
unset(mask);

View file

@ -125,12 +125,12 @@ public:
enum {
chunk_bits = 10,
pow_bits = 5,
oop_bits = sizeof(uintptr_t)*8 - chunk_bits - pow_bits,
oop_bits = sizeof(uintptr_t)*8 - chunk_bits - pow_bits
};
enum {
oop_shift = 0,
pow_shift = oop_shift + oop_bits,
chunk_shift = pow_shift + pow_bits,
chunk_shift = pow_shift + pow_bits
};
public:

View file

@ -73,7 +73,7 @@ public:
_verify_marked_incomplete,
// Objects should be marked in "complete" bitmap.
_verify_marked_complete,
_verify_marked_complete
} VerifyMarked;
typedef enum {
@ -84,7 +84,7 @@ public:
_verify_forwarded_none,
// Objects may have forwardees.
_verify_forwarded_allow,
_verify_forwarded_allow
} VerifyForwarded;
typedef enum {
@ -97,7 +97,7 @@ public:
// May have references to cset, all should be forwarded.
// Note: Allowing non-forwarded references to cset is equivalent
// to _verify_cset_disable.
_verify_cset_forwarded,
_verify_cset_forwarded
} VerifyCollectionSet;
typedef enum {
@ -109,7 +109,7 @@ public:
// All objects should belong to live regions,
// and liveness data should be accurate
_verify_liveness_complete,
_verify_liveness_complete
} VerifyLiveness;
typedef enum {
@ -123,7 +123,7 @@ public:
_verify_regions_nocset,
// No trash and no cset regions allowed
_verify_regions_notrash_nocset,
_verify_regions_notrash_nocset
} VerifyRegions;
typedef enum {
@ -137,7 +137,7 @@ public:
_verify_gcstate_forwarded,
// Evacuation is in progress, some objects are forwarded
_verify_gcstate_evacuation,
_verify_gcstate_evacuation
} VerifyGCState;
struct VerifyOptions {