Change COMPILE_ASSERT to take only one argument and use it in more places.

runtime/vm/locations.h

 // 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.
 
 #ifndef VM_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
@@ skipping 79 matching lines @@
     kRegister = 8,
 
     // FpuRegister location represents a fixed fpu register.  Payload contains
     // its code.
     kFpuRegister = 12,
   };
 
   Location() : value_(kInvalidLocation) {
     // Verify that non-tagged location kinds do not interfere with location tags
     // (kConstantTag and kPairLocationTag).
-    COMPILE_ASSERT(((kInvalid & kLocationTagMask) != kConstantTag),
-                   invalid_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kInvalid & kLocationTagMask) != kPairLocationTag),
-                   invalid_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kInvalid & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kInvalid & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kUnallocated & kLocationTagMask) != kConstantTag),
-                   unallocated_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kUnallocated & kLocationTagMask) != kPairLocationTag),
-                   unallocated_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kUnallocated & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kUnallocated & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kStackSlot & kLocationTagMask) != kConstantTag),
-                   stackslot_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kStackSlot & kLocationTagMask) != kPairLocationTag),
-                   stackslot_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kStackSlot & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kStackSlot & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kDoubleStackSlot & kLocationTagMask) != kConstantTag),
-                   doublestackslot_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kDoubleStackSlot & kLocationTagMask) != kPairLocationTag),
-                   doublestackslot_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kDoubleStackSlot & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kDoubleStackSlot & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kQuadStackSlot & kLocationTagMask) != kConstantTag),
-                   quadstackslot_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kQuadStackSlot & kLocationTagMask) != kPairLocationTag),
-                   quadstackslot_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kQuadStackSlot & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kQuadStackSlot & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kRegister & kLocationTagMask) != kConstantTag),
-                   register_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kRegister & kLocationTagMask) != kPairLocationTag),
-                   register_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kRegister & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kRegister & kLocationTagMask) != kPairLocationTag);
 
-    COMPILE_ASSERT(((kFpuRegister & kLocationTagMask) != kConstantTag),
-                   fpuregister_conflicts_with_constant_tag);
-    COMPILE_ASSERT(((kFpuRegister & kLocationTagMask) != kPairLocationTag),
-                   fpuregister_conflicts_with_pair_tag);
+    COMPILE_ASSERT((kFpuRegister & kLocationTagMask) != kConstantTag);
+    COMPILE_ASSERT((kFpuRegister & kLocationTagMask) != kPairLocationTag);
 
     // Verify tags and tagmask.
-    COMPILE_ASSERT(((kConstantTag & kLocationTagMask) == kConstantTag),
-                   bad_constant_tag);
+    COMPILE_ASSERT((kConstantTag & kLocationTagMask) == kConstantTag);
 
-    COMPILE_ASSERT(((kPairLocationTag & kLocationTagMask) == kPairLocationTag),
-                  bad_pair_tag);
+    COMPILE_ASSERT((kPairLocationTag & kLocationTagMask) == kPairLocationTag);
 
     ASSERT(IsInvalid());
   }
 
   Location(const Location& other) : ValueObject(), value_(other.value_) { }
 
   Location& operator=(const Location& other) {
     value_ = other.value_;
     return *this;
   }
@@ skipping 480 matching lines @@
   BitmapBuilder* stack_bitmap_;
 
   const ContainsCall contains_call_;
   RegisterSet live_registers_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_