# HG changeset patch
# User never
# Date 1301947024 25200
# Node ID 8b2317d732ec7484d71df6aff7c3c1e02db9d8a6
# Parent  e863062e521d62c597b06cdf24369b77fe17b517
7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed
Reviewed-by: kvn, jrose

diff -r e863062e521d -r 8b2317d732ec src/share/vm/opto/loopTransform.cpp
--- a/src/share/vm/opto/loopTransform.cpp	Mon Apr 04 03:02:00 2011 -0700
+++ b/src/share/vm/opto/loopTransform.cpp	Mon Apr 04 12:57:04 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()) {