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

7032696: Fix for 7029152 broke VM

Browse source 
StrIntrinsicNode::Ideal() should not optimize memory during Parse.

Reviewed-by: jrose, never
This commit is contained in:
Vladimir Kozlov 2011-03-31 13:22:34 -07:00
parent c9e2dcda4b
commit 0493606cdd
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/opto/loopTransform.cpp
View file

@ -432,6 +432,12 @@ bool IdealLoopTree::policy_maximally_unroll( PhaseIdealLoop *phase ) const {
return false; 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. // Do not unroll a loop with String intrinsics code.
// String intrinsics are large and have loops. // String intrinsics are large and have loops.
for (uint k = 0; k < _body.size(); k++) { for (uint k = 0; k < _body.size(); k++) {

16
hotspot/src/share/vm/opto/memnode.cpp
View file

@ -2628,12 +2628,16 @@ uint StrIntrinsicNode::match_edge(uint idx) const {
Node *StrIntrinsicNode::Ideal(PhaseGVN *phase, bool can_reshape) { Node *StrIntrinsicNode::Ideal(PhaseGVN *phase, bool can_reshape) {
if (remove_dead_region(phase, can_reshape)) return this; if (remove_dead_region(phase, can_reshape)) return this;
Node* mem = phase->transform(in(MemNode::Memory)); if (can_reshape) {
// If transformed to a MergeMem, get the desired slice Node* mem = phase->transform(in(MemNode::Memory));
uint alias_idx = phase->C->get_alias_index(adr_type()); // If transformed to a MergeMem, get the desired slice
mem = mem->is_MergeMem() ? mem->as_MergeMem()->memory_at(alias_idx) : mem; uint alias_idx = phase->C->get_alias_index(adr_type());
if (mem != in(MemNode::Memory)) mem = mem->is_MergeMem() ? mem->as_MergeMem()->memory_at(alias_idx) : mem;
set_req(MemNode::Memory, mem); if (mem != in(MemNode::Memory)) {
set_req(MemNode::Memory, mem);
return this;
}
}
return NULL; return NULL;
} }