Mercurial > hg > graal-compiler
changeset 2450:a54519951ff6
Merge
author | iveresov |
---|---|
date | Mon, 04 Apr 2011 18:48:49 -0700 |
parents | bb22629531fa (current diff) 8b2317d732ec (diff) |
children | fb37e3eabfd0 d7a3fed1c1c9 |
files | |
diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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()) {