Mercurial > hg > truffle
diff src/share/vm/opto/lcm.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | 70120f47d403 |
children | d1034bd8cefc d2907f74462e |
line wrap: on
line diff
--- a/src/share/vm/opto/lcm.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/opto/lcm.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -219,9 +219,10 @@ // cannot reason about it; is probably not implicit null exception } else { const TypePtr* tptr; - if (UseCompressedOops && Universe::narrow_oop_shift() == 0) { + if (UseCompressedOops && (Universe::narrow_oop_shift() == 0 || + Universe::narrow_klass_shift() == 0)) { // 32-bits narrow oop can be the base of address expressions - tptr = base->bottom_type()->make_ptr(); + tptr = base->get_ptr_type(); } else { // only regular oops are expected here tptr = base->bottom_type()->is_ptr();