Mercurial > hg > truffle
diff src/share/vm/opto/memnode.cpp @ 293:c3e045194476
6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type")
Summary: fixed few addP node type and narrow oop type problems.
Reviewed-by: rasbold, never
| author | kvn |
|---|---|
| date | Fri, 01 Aug 2008 10:06:45 -0700 |
| parents | b0fe4deeb9fb |
| children | ab075d07f1ba |
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.cpp Thu Jul 31 15:47:42 2008 -0700 +++ b/src/share/vm/opto/memnode.cpp Fri Aug 01 10:06:45 2008 -0700 @@ -1231,6 +1231,10 @@ // our new node, even though we may throw the node away. // (This tweaking with igvn only works because x is a new node.) igvn->set_type(x, t); + // If x is a TypeNode, capture any more-precise type permanently into Node + // othewise it will be not updated during igvn->transform since + // igvn->type(x) is set to x->Value() already. + x->raise_bottom_type(t); Node *y = x->Identity(igvn); if( y != x ) { wins++; @@ -1409,7 +1413,7 @@ // had an original form like p1:(AddP x x (LShiftL quux 3)), where the // expression (LShiftL quux 3) independently optimized to the constant 8. if ((t->isa_int() == NULL) && (t->isa_long() == NULL) - && Opcode() != Op_LoadKlass) { + && Opcode() != Op_LoadKlass && Opcode() != Op_LoadNKlass) { // t might actually be lower than _type, if _type is a unique // concrete subclass of abstract class t. // Make sure the reference is not into the header, by comparing