archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 20:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8080775: Better argument formatting for assert() and friends

Browse source 
Reviewed-by: kbarrett, pliden
This commit is contained in:
David Lindholm 2015-09-29 11:02:08 +02:00
parent aa0818a98a
commit 1e71f67736
225 changed files with 1342 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/opto/graphKit.cpp
View file

@ -1251,7 +1251,7 @@ Node* GraphKit::null_check_common(Node* value, BasicType type,
}
default:
fatal(err_msg_res("unexpected type: %s", type2name(type)));
fatal("unexpected type: %s", type2name(type));
}
assert(chk != NULL, "sanity check");
chk = _gvn.transform(chk);
@ -1950,8 +1950,8 @@ void GraphKit::uncommon_trap(int trap_request,
// the current bytecode.
int inputs, ignored_depth;
if (compute_stack_effects(inputs, ignored_depth)) {
assert(sp() >= inputs, err_msg_res("must have enough JVMS stack to execute %s: sp=%d, inputs=%d",
Bytecodes::name(java_bc()), sp(), inputs));
assert(sp() >= inputs, "must have enough JVMS stack to execute %s: sp=%d, inputs=%d",
Bytecodes::name(java_bc()), sp(), inputs);
}
}
#endif
@ -1987,7 +1987,7 @@ void GraphKit::uncommon_trap(int trap_request,
case Deoptimization::Action_make_not_compilable:
break;
default:
fatal(err_msg_res("unknown action %d: %s", action, Deoptimization::trap_action_name(action)));
fatal("unknown action %d: %s", action, Deoptimization::trap_action_name(action));
break;
#endif
}
@ -2509,7 +2509,7 @@ static IfNode* gen_subtype_check_compare(Node* ctrl, Node* in1, Node* in2, BoolT
switch(bt) {
case T_INT: cmp = new CmpINode(in1, in2); break;
case T_ADDRESS: cmp = new CmpPNode(in1, in2); break;
default: fatal(err_msg("unexpected comparison type %s", type2name(bt)));
default: fatal("unexpected comparison type %s", type2name(bt));
}
gvn->transform(cmp);
Node* bol = gvn->transform(new BoolNode(cmp, test));