Mercurial > hg > truffle
diff src/share/vm/opto/superword.cpp @ 235:9c2ecc2ffb12 jdk7-b31
Merge
author | trims |
---|---|
date | Fri, 11 Jul 2008 01:14:44 -0700 |
parents | d1605aabd0a1 1e026f8da827 |
children | b0fe4deeb9fb |
line wrap: on
line diff
--- a/src/share/vm/opto/superword.cpp Thu Jul 03 11:01:32 2008 -0700 +++ b/src/share/vm/opto/superword.cpp Fri Jul 11 01:14:44 2008 -0700 @@ -1424,9 +1424,9 @@ //---------------------------container_type--------------------------- // Smallest type containing range of values const Type* SuperWord::container_type(const Type* t) { - if (t->isa_narrowoop()) t = t->is_narrowoop()->make_oopptr(); - if (t->isa_aryptr()) { - t = t->is_aryptr()->elem(); + const Type* tp = t->make_ptr(); + if (tp && tp->isa_aryptr()) { + t = tp->is_aryptr()->elem(); } if (t->basic_type() == T_INT) { if (t->higher_equal(TypeInt::BOOL)) return TypeInt::BOOL;