--- a/hotspot/src/share/vm/memory/virtualspace.cpp Mon Sep 28 15:05:02 2015 +0200
+++ b/hotspot/src/share/vm/memory/virtualspace.cpp Tue Sep 29 11:02:08 2015 +0200
@@ -137,9 +137,9 @@
}
// Check alignment constraints.
assert((uintptr_t) base % alignment == 0,
- err_msg("Large pages returned a non-aligned address, base: "
- PTR_FORMAT " alignment: " PTR_FORMAT,
- base, (void*)(uintptr_t)alignment));
+ "Large pages returned a non-aligned address, base: "
+ PTR_FORMAT " alignment: " PTR_FORMAT,
+ base, (void*)(uintptr_t)alignment);
_special = true;
} else {
// failed; try to reserve regular memory below
@@ -334,9 +334,9 @@
if (base != NULL) {
// Check alignment constraints.
assert((uintptr_t) base % alignment == 0,
- err_msg("Large pages returned a non-aligned address, base: "
- PTR_FORMAT " alignment: " PTR_FORMAT,
- base, (void*)(uintptr_t)alignment));
+ "Large pages returned a non-aligned address, base: "
+ PTR_FORMAT " alignment: " PTR_FORMAT,
+ base, (void*)(uintptr_t)alignment);
_special = true;
}
}
@@ -1205,20 +1205,20 @@
TestReservedSpace::test_reserved_space();
}
-#define assert_equals(actual, expected) \
- assert(actual == expected, \
- err_msg("Got " SIZE_FORMAT " expected " \
- SIZE_FORMAT, actual, expected));
+#define assert_equals(actual, expected) \
+ assert(actual == expected, \
+ "Got " SIZE_FORMAT " expected " \
+ SIZE_FORMAT, actual, expected);
#define assert_ge(value1, value2) \
assert(value1 >= value2, \
- err_msg("'" #value1 "': " SIZE_FORMAT " '" \
- #value2 "': " SIZE_FORMAT, value1, value2));
+ "'" #value1 "': " SIZE_FORMAT " '" \
+ #value2 "': " SIZE_FORMAT, value1, value2);
#define assert_lt(value1, value2) \
assert(value1 < value2, \
- err_msg("'" #value1 "': " SIZE_FORMAT " '" \
- #value2 "': " SIZE_FORMAT, value1, value2));
+ "'" #value1 "': " SIZE_FORMAT " '" \
+ #value2 "': " SIZE_FORMAT, value1, value2);
class TestVirtualSpace : AllStatic {