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

8136469: OptimizeStringConcat fails on pre-sized StringBuilder shapes

Browse source 
Cut off dead if branch already during parsing (GVN).

Reviewed-by: shade, kvn, roland
This commit is contained in:
Tobias Hartmann 2016-01-12 12:55:37 +01:00
parent 69b52aa28b
commit 0e1b2cd198
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -822,11 +822,10 @@ bool StringConcat::validate_mem_flow() {
}
} else if (ctrl->is_IfTrue()) { // null checks, class checks
iff = ctrl->in(0)->as_If();
assert(iff->is_If(), "must be if");
// Verify that the other arm is an uncommon trap
Node* otherproj = iff->proj_out(1 - ctrl->as_Proj()->_con);
CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava();
assert(strcmp(call->_name, "uncommon_trap") == 0, "must be uncommond trap");
assert(strcmp(call->_name, "uncommon_trap") == 0, "must be uncommon trap");
ctrl = iff->in(0);
} else {
break;
@ -914,6 +913,13 @@ bool StringConcat::validate_control_flow() {
BoolNode* b = iff->in(1)->isa_Bool();
if (b == NULL) {
#ifndef PRODUCT
if (PrintOptimizeStringConcat) {
tty->print_cr("unexpected input to IfNode");
iff->in(1)->dump();
tty->cr();
}
#endif
fail = true;
break;
}