Mercurial > hg > truffle
comparison src/share/vm/opto/matcher.cpp @ 647:bd441136a5ce
Merge
author | kvn |
---|---|
date | Thu, 19 Mar 2009 09:13:24 -0700 |
parents | 7bb995fbd3c0 660978a2a31a |
children | fbde8ec322d0 |
comparison
equal
deleted
inserted
replaced
640:ba50942c8138 | 647:bd441136a5ce |
---|---|
1479 assert(m != NULL && m->is_Mem(), "expecting memory node"); | 1479 assert(m != NULL && m->is_Mem(), "expecting memory node"); |
1480 } | 1480 } |
1481 const Type* mach_at = mach->adr_type(); | 1481 const Type* mach_at = mach->adr_type(); |
1482 // DecodeN node consumed by an address may have different type | 1482 // DecodeN node consumed by an address may have different type |
1483 // then its input. Don't compare types for such case. | 1483 // then its input. Don't compare types for such case. |
1484 if (m->adr_type() != mach_at && m->in(MemNode::Address)->is_AddP() && | 1484 if (m->adr_type() != mach_at && |
1485 m->in(MemNode::Address)->in(AddPNode::Address)->is_DecodeN()) { | 1485 (m->in(MemNode::Address)->is_DecodeN() || |
1486 m->in(MemNode::Address)->is_AddP() && | |
1487 m->in(MemNode::Address)->in(AddPNode::Address)->is_DecodeN() || | |
1488 m->in(MemNode::Address)->is_AddP() && | |
1489 m->in(MemNode::Address)->in(AddPNode::Address)->is_AddP() && | |
1490 m->in(MemNode::Address)->in(AddPNode::Address)->in(AddPNode::Address)->is_DecodeN())) { | |
1486 mach_at = m->adr_type(); | 1491 mach_at = m->adr_type(); |
1487 } | 1492 } |
1488 if (m->adr_type() != mach_at) { | 1493 if (m->adr_type() != mach_at) { |
1489 m->dump(); | 1494 m->dump(); |
1490 tty->print_cr("mach:"); | 1495 tty->print_cr("mach:"); |