Revert 'Revert to use macro REG_MASK_BIT, now with parentheses.'

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
@@ skipping 1183 matching lines @@
     if (!blocked_registers[regno]) {
       blocked_registers[regno] = true;
       return static_cast<Register>(regno);
     }
   }
   UNREACHABLE();
   return kNoRegister;
 }
 
 
-#define REG_MASK_BIT(reg) (((reg) != kNoRegister) ? (1 << (reg)) : 0)
+static uword RegMaskBit(Register reg) {
+  return ((reg) != kNoRegister) ? (1 << (reg)) : 0;
+}
+
+
 // Mask of globally reserved registers. Some other registers are only reserved
 // in particular code (e.g., ARGS_DESC_REG in intrinsics).
-static const uword kReservedCpuRegisters = REG_MASK_BIT(SPREG)
-                                         | REG_MASK_BIT(FPREG)
-                                         | REG_MASK_BIT(TMP)
-                                         | REG_MASK_BIT(TMP2)
-                                         | REG_MASK_BIT(PP)
-                                         | REG_MASK_BIT(THR);
+static const uword kReservedCpuRegisters = RegMaskBit(SPREG)
+                                         | RegMaskBit(FPREG)
+                                         | RegMaskBit(TMP)
+                                         | RegMaskBit(TMP2)
+                                         | RegMaskBit(PP)
+                                         | RegMaskBit(THR);
 
 
 void FlowGraphCompiler::AllocateRegistersLocally(Instruction* instr) {
   ASSERT(!is_optimizing());
 
   instr->InitializeLocationSummary(zone(),
                                    false);  // Not optimizing.
   LocationSummary* locs = instr->locs();
 
   bool blocked_registers[kNumberOfCpuRegisters];
@@ skipping 286 matching lines @@
     resolver_->RestoreFpuScratch(reg_);
   }
 }
 
 
 ParallelMoveResolver::ScratchRegisterScope::ScratchRegisterScope(
     ParallelMoveResolver* resolver, Register blocked)
     : resolver_(resolver),
       reg_(kNoRegister),
       spilled_(false) {
-  uword blocked_mask = REG_MASK_BIT(blocked) | kReservedCpuRegisters;
+  uword blocked_mask = RegMaskBit(blocked) | kReservedCpuRegisters;
   if (resolver->compiler_->intrinsic_mode()) {
     // Block additional registers that must be preserved for intrinsics.
-    blocked_mask |= REG_MASK_BIT(ARGS_DESC_REG);
+    blocked_mask |= RegMaskBit(ARGS_DESC_REG);
   }
   reg_ = static_cast<Register>(
       resolver_->AllocateScratchRegister(Location::kRegister,
                                          blocked_mask,
                                          kFirstFreeCpuRegister,
                                          kLastFreeCpuRegister,
                                          &spilled_));
 
   if (spilled_) {
     resolver->SpillScratch(reg_);
@@ skipping 200 matching lines @@
 
 
 void FlowGraphCompiler::FrameStateClear() {
   ASSERT(!is_optimizing());
   frame_state_.TruncateTo(0);
 }
 #endif
 
 
 }  // namespace dart