src/share/vm/gc/g1/heapRegionType.hpp

@@ -26,11 +26,11 @@
 #define SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
 
 #include "memory/allocation.hpp"
 
 #define hrt_assert_is_valid(tag) \
-  assert(is_valid((tag)), err_msg("invalid HR type: %u", (uint) (tag)))
+  assert(is_valid((tag)), "invalid HR type: %u", (uint) (tag))
 
 class HeapRegionType VALUE_OBJ_CLASS_SPEC {
 private:
   // We encode the value of the heap region type so the generation can be
   // determined quickly. The tag is split into two parts:

@@ -95,12 +95,11 @@
   // transition.
   void set_from(Tag tag, Tag before) {
     hrt_assert_is_valid(tag);
     hrt_assert_is_valid(before);
     hrt_assert_is_valid(_tag);
-    assert(_tag == before,
-           err_msg("HR tag: %u, expected: %u new tag; %u", _tag, before, tag));
+    assert(_tag == before, "HR tag: %u, expected: %u new tag; %u", _tag, before, tag);
     _tag = tag;
   }
 
 public:
   // Queries