# HG changeset patch
# User iveresov
# Date 1301968129 25200
# Node ID a54519951ff6bb50d54b182882219a89e82a8a5c
# Parent  bb22629531fa20ed1c757cef29d05b8f3864b2ba# Parent  8b2317d732ec7484d71df6aff7c3c1e02db9d8a6
Merge

diff -r bb22629531fa -r a54519951ff6 src/share/vm/opto/loopTransform.cpp
--- a/src/share/vm/opto/loopTransform.cpp	Mon Apr 04 16:00:34 2011 -0700
+++ b/src/share/vm/opto/loopTransform.cpp	Mon Apr 04 18:48:49 2011 -0700
@@ -2112,9 +2112,12 @@
       if (value != head->phi()) {
         msg = "unhandled shift in address";
       } else {
-        found_index = true;
-        shift = n;
-        assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int(), "scale should match");
+        if (type2aelembytes(store->as_Mem()->memory_type(), true) != (1 << n->in(2)->get_int())) {
+          msg = "scale doesn't match";
+        } else {
+          found_index = true;
+          shift = n;
+        }
       }
     } else if (n->Opcode() == Op_ConvI2L && conv == NULL) {
       if (n->in(1) == head->phi()) {