Mercurial > hg > truffle
diff src/share/vm/opto/machnode.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 | 190899198332 |
line wrap: on
line diff
--- a/src/share/vm/opto/machnode.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/opto/machnode.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -349,11 +349,11 @@ if (base == NodeSentinel) return TypePtr::BOTTOM; const Type* t = base->bottom_type(); - if (UseCompressedOops && Universe::narrow_oop_shift() == 0) { + if (t->isa_narrowoop() && Universe::narrow_oop_shift() == 0) { // 32-bit unscaled narrow oop can be the base of any address expression t = t->make_ptr(); } - if (UseCompressedKlassPointers && Universe::narrow_klass_shift() == 0) { + if (t->isa_narrowklass() && Universe::narrow_klass_shift() == 0) { // 32-bit unscaled narrow oop can be the base of any address expression t = t->make_ptr(); }