Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed
authornever
Mon, 04 Apr 2011 12:57:04 -0700
changeset 9104 85edf8ec98b2
parent 9103 535a93f494f6
child 9106 fc511f136aea
child 9107 8ac339c8f87f
7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed Reviewed-by: kvn, jrose
hotspot/src/share/vm/opto/loopTransform.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/opto/loopTransform.cpp	Mon Apr 04 03:02:00 2011 -0700
+++ b/hotspot/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()) {
jdk-sandbox