--- old/src/share/vm/memory/metaspace.cpp	2014-03-13 13:50:30.450276175 +0100
+++ new/src/share/vm/memory/metaspace.cpp	2014-03-13 13:50:30.346276170 +0100
@@ -185,13 +185,11 @@
   // Remove from a list by size.  Selects list based on size of chunk.
   Metachunk* free_chunks_get(size_t chunk_word_size);
 
-#define index_bounds_check(index)                                                       \
-  do {                                                                                  \
-    assert(index == SpecializedIndex ||                                                 \
-           index == SmallIndex ||                                                       \
-           index == MediumIndex ||                                                      \
-           index == HumongousIndex, err_msg("Bad index: %d", (int) index));             \
-  } while (0)
+#define index_bounds_check(index)                                         \
+  assert(index == SpecializedIndex ||                                     \
+         index == SmallIndex ||                                           \
+         index == MediumIndex ||                                          \
+         index == HumongousIndex, err_msg("Bad index: %d", (int) index))
 
   size_t num_free_chunks(ChunkIndex index) const {
     index_bounds_check(index);