OpenJDK / jdk / hs
changeset 8884:9e2b81253ef9
7032696: Fix for 7029152 broke VM
Summary: StrIntrinsicNode::Ideal() should not optimize memory during Parse.
Reviewed-by: jrose, never
| author | kvn |
|---|---|
| date | Thu, 31 Mar 2011 13:22:34 -0700 |
| parents | 5569135acca3 |
| children | ede3202e00e0 |
| files | hotspot/src/share/vm/opto/loopTransform.cpp hotspot/src/share/vm/opto/memnode.cpp |
| diffstat | 2 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Thu Mar 31 02:31:57 2011 -0700 +++ b/hotspot/src/share/vm/opto/loopTransform.cpp Thu Mar 31 13:22:34 2011 -0700 @@ -432,6 +432,12 @@ return false; } + // Currently we don't have policy to optimize one iteration loops. + // Maximally unrolling transformation is used for that: + // it is peeled and the original loop become non reachable (dead). + if (trip_count == 1) + return true; + // Do not unroll a loop with String intrinsics code. // String intrinsics are large and have loops. for (uint k = 0; k < _body.size(); k++) {
--- a/hotspot/src/share/vm/opto/memnode.cpp Thu Mar 31 02:31:57 2011 -0700 +++ b/hotspot/src/share/vm/opto/memnode.cpp Thu Mar 31 13:22:34 2011 -0700 @@ -2628,12 +2628,16 @@ Node *StrIntrinsicNode::Ideal(PhaseGVN *phase, bool can_reshape) { if (remove_dead_region(phase, can_reshape)) return this; - Node* mem = phase->transform(in(MemNode::Memory)); - // If transformed to a MergeMem, get the desired slice - uint alias_idx = phase->C->get_alias_index(adr_type()); - mem = mem->is_MergeMem() ? mem->as_MergeMem()->memory_at(alias_idx) : mem; - if (mem != in(MemNode::Memory)) - set_req(MemNode::Memory, mem); + if (can_reshape) { + Node* mem = phase->transform(in(MemNode::Memory)); + // If transformed to a MergeMem, get the desired slice + uint alias_idx = phase->C->get_alias_index(adr_type()); + mem = mem->is_MergeMem() ? mem->as_MergeMem()->memory_at(alias_idx) : mem; + if (mem != in(MemNode::Memory)) { + set_req(MemNode::Memory, mem); + return this; + } + } return NULL; }