Merge

src/share/vm/opto/loopTransform.cpp

@@ -432,6 +432,12 @@ bool IdealLoopTree::policy_maximally_unroll( PhaseIdealLoop *phase ) const {
     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++) {

src/share/vm/opto/memnode.cpp

@@ -2628,12 +2628,16 @@ uint StrIntrinsicNode::match_edge(uint idx) const {
 Node *StrIntrinsicNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (remove_dead_region(phase, can_reshape)) return this;
 
+  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))
+    if (mem != in(MemNode::Memory)) {
       set_req(MemNode::Memory, mem);
+      return this;
+    }
+  }
   return NULL;
 }