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

runtime/platform/assert.h

 // Copyright (c) 2012, 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 PLATFORM_ASSERT_H_
 #define PLATFORM_ASSERT_H_
 
 // TODO(5411406): include sstream for now, once we have a Utils::toString()
 // implemented for all the primitive types we can replace the usage of
 // sstream by Utils::toString()
@@ skipping 256 matching lines @@
 
 #define DEBUG_ASSERT(cond)
 
 #endif  // if defined(DEBUG)
 
 
 // The COMPILE_ASSERT macro can be used to verify that a compile time
 // expression is true. For example, you could use it to verify the
 // size of a static array:
 //
-//   COMPILE_ASSERT(ARRAYSIZE(content_type_names) == CONTENT_NUM_TYPES,
-//                  content_type_names_incorrect_size);
+//   COMPILE_ASSERT(ARRAYSIZE(content_type_names) == CONTENT_NUM_TYPES);
 //
 // or to make sure a struct is smaller than a certain size:
 //
-//   COMPILE_ASSERT(sizeof(foo) < 128, foo_too_large);
+//   COMPILE_ASSERT(sizeof(foo) < 128);
 //
-// The second argument to the macro is the name of the variable. If
-// the expression is false, most compilers will issue a warning/error
-// containing the name of the variable.
 
 template <bool>
 struct CompileAssert {
 };
-
-#define COMPILE_ASSERT(expr, msg)                                              \
+// Macro to concatenate two tokens. The helper is need to proper expansion
+// in case an argument is a macro itself.
+#define COMPILE_ASSERT_JOIN(a, b) COMPILE_ASSERT_JOIN_HELPER(a, b)
+#define COMPILE_ASSERT_JOIN_HELPER(a, b) a##b
+#define COMPILE_ASSERT(expr)                                                   \
   DART_UNUSED typedef CompileAssert<(static_cast<bool>(expr))>                 \
-  msg[static_cast<bool>(expr) ? 1 : -1]
-
+  COMPILE_ASSERT_JOIN(CompileAssertTypeDef, __LINE__)[static_cast<bool>(expr)  \
+  ? 1 : -1]
 
 #if defined(TESTING)
 
 // EXPECT and FAIL are equivalent to ASSERT and FATAL except that they do not
 // cause early termination of the unit test. This allows testing to proceed
 // further to be able to report other failures before reporting the overall
 // unit tests as failing.
 
 #define EXPECT(condition)                                                      \
   if (!(condition)) {                                                          \
@@ skipping 38 matching lines @@
 
 #define FAIL1(format, p1)                                                      \
   dart::Expect(__FILE__, __LINE__).Fail(format, (p1))
 
 #define FAIL2(format, p1, p2)                                                  \
   dart::Expect(__FILE__, __LINE__).Fail(format, (p1), (p2))
 
 #endif  // defined(TESTING)
 
 #endif  // PLATFORM_ASSERT_H_