diff src/share/vm/opto/loopTransform.cpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents b30b3c2a0cf2
children b5cb079ecaa4
line wrap: on
line diff
--- a/src/share/vm/opto/loopTransform.cpp	Thu Jan 31 11:32:14 2013 +0100
+++ b/src/share/vm/opto/loopTransform.cpp	Thu Jan 31 15:42:25 2013 +0100
@@ -613,6 +613,7 @@
       case Op_StrComp:
       case Op_StrEquals:
       case Op_StrIndexOf:
+      case Op_EncodeISOArray:
       case Op_AryEq: {
         return false;
       }
@@ -717,6 +718,7 @@
       case Op_StrComp:
       case Op_StrEquals:
       case Op_StrIndexOf:
+      case Op_EncodeISOArray:
       case Op_AryEq: {
         // Do not unroll a loop with String intrinsics code.
         // String intrinsics are large and have loops.