--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Mon Sep 28 15:05:02 2015 +0200
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Tue Sep 29 11:02:08 2015 +0200
@@ -56,7 +56,7 @@
#ifdef ASSERT
static int check_nonzero(const char* xname, int x) {
- assert(x != 0, err_msg("%s should be nonzero", xname));
+ assert(x != 0, "%s should be nonzero", xname);
return x;
}
#define NONZERO(x) check_nonzero(#x, x)
@@ -453,7 +453,7 @@
}
default:
- fatal(err_msg_res("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid)));
+ fatal("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid));
break;
}