8256203: Simplify RegMask::Empty

cl4es · cl4es · commit f7685a4639f5 · 2020-11-12T14:20:48.000Z
Reviewed-by: thartmann, chagedorn
diff --git a/src/hotspot/share/opto/regmask.cpp b/src/hotspot/share/opto/regmask.cpp
@@ -49,12 +49,7 @@ void OptoReg::dump(int r, outputStream *st) {
 
 
 //=============================================================================
-const RegMask RegMask::Empty(
-# define BODY(I) 0,
-  FORALL_BODY
-# undef BODY
-  0
-);
+const RegMask RegMask::Empty;
 
 //=============================================================================
 bool RegMask::is_vector(uint ireg) {
diff --git a/src/hotspot/share/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp
@@ -136,7 +136,9 @@ class RegMask {
   }
 
   // Construct an empty mask
-  RegMask() : _RM_UP(), _lwm(_RM_SIZE - 1), _hwm(0) {}
+  RegMask() : _RM_UP(), _lwm(_RM_SIZE - 1), _hwm(0) {
+    assert(valid_watermarks(), "post-condition");
+  }
 
   // Construct a mask with a single bit
   RegMask(OptoReg::Name reg) : RegMask() {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,9 @@ class RegMask {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// Construct an empty mask`
`139`		`- RegMask() : _RM_UP(), _lwm(_RM_SIZE - 1), _hwm(0) {}`
	`139`	`+ RegMask() : _RM_UP(), _lwm(_RM_SIZE - 1), _hwm(0) {`
	`140`	`+ assert(valid_watermarks(), "post-condition");`
	`141`	`+ }`
`140`	`142`
`141`	`143`	`// Construct a mask with a single bit`
`142`	`144`	`RegMask(OptoReg::Name reg) : RegMask() {`