--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp Mon Sep 28 15:05:02 2015 +0200
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp Tue Sep 29 11:02:08 2015 +0200
@@ -179,11 +179,11 @@
KlassHandle object_klass = SystemDictionary::Object_klass();
Method * object_resolved_method = object_klass()->vtable()->method_at(index);
assert(object_resolved_method->name() == resolved_method->name(),
- err_msg("Object and interface method names should match at vtable index %d, %s != %s",
- index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string()));
+ "Object and interface method names should match at vtable index %d, %s != %s",
+ index, object_resolved_method->name()->as_C_string(), resolved_method->name()->as_C_string());
assert(object_resolved_method->signature() == resolved_method->signature(),
- err_msg("Object and interface method signatures should match at vtable index %d, %s != %s",
- index, object_resolved_method->signature()->as_C_string(), resolved_method->signature()->as_C_string()));
+ "Object and interface method signatures should match at vtable index %d, %s != %s",
+ index, object_resolved_method->signature()->as_C_string(), resolved_method->signature()->as_C_string());
#endif // ASSERT
kind = CallInfo::vtable_call;
@@ -192,7 +192,7 @@
kind = CallInfo::itable_call;
index = resolved_method->itable_index();
}
- assert(index == Method::nonvirtual_vtable_index || index >= 0, err_msg("bad index %d", index));
+ assert(index == Method::nonvirtual_vtable_index || index >= 0, "bad index %d", index);
_call_kind = kind;
_call_index = index;
_resolved_appendix = Handle();
@@ -215,7 +215,7 @@
assert(call_kind() != CallInfo::unknown_kind, "CallInfo must be set");
break;
default:
- fatal(err_msg_res("Unexpected call kind %d", call_kind()));
+ fatal("Unexpected call kind %d", call_kind());
}
}
#endif //ASSERT
@@ -499,7 +499,7 @@
result->print();
}
assert(actual_size_of_params == expected_size_of_params,
- err_msg("%d != %d", actual_size_of_params, expected_size_of_params));
+ "%d != %d", actual_size_of_params, expected_size_of_params);
#endif //ASSERT
assert(appendix_result_or_null != NULL, "");