--- a/hotspot/src/share/vm/opto/memnode.cpp Thu Oct 01 11:52:44 2015 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp Wed Oct 07 01:03:24 2015 +0200
@@ -1139,7 +1139,7 @@
// Only integer types have boxing cache.
assert(bt == T_BOOLEAN || bt == T_CHAR ||
bt == T_BYTE || bt == T_SHORT ||
- bt == T_INT || bt == T_LONG, err_msg_res("wrong type = %s", type2name(bt)));
+ bt == T_INT || bt == T_LONG, "wrong type = %s", type2name(bt));
jlong cache_low = (bt == T_LONG) ? c.as_long() : c.as_int();
if (cache_low != (int)cache_low) {
return NULL; // should not happen since cache is array indexed by value
@@ -2394,7 +2394,7 @@
Opcode() == Op_StoreVector ||
phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw ||
(Opcode() == Op_StoreL && st->Opcode() == Op_StoreI), // expanded ClearArrayNode
- err_msg_res("no mismatched stores, except on raw memory: %s %s", NodeClassNames[Opcode()], NodeClassNames[st->Opcode()]));
+ "no mismatched stores, except on raw memory: %s %s", NodeClassNames[Opcode()], NodeClassNames[st->Opcode()]);
if (st->in(MemNode::Address)->eqv_uncast(address) &&
st->as_Store()->memory_size() <= this->memory_size()) {
@@ -3289,7 +3289,7 @@
// the store control then we cannot capture the store.
assert(!n->is_Store(), "2 stores to same slice on same control?");
Node* base = other_adr;
- assert(base->is_AddP(), err_msg_res("should be addp but is %s", base->Name()));
+ assert(base->is_AddP(), "should be addp but is %s", base->Name());
base = base->in(AddPNode::Base);
if (base != NULL) {
base = base->uncast();