Mercurial > hg > truffle
changeset 4822:94f0ce74d48e
Merge
author | kvn |
---|---|
date | Wed, 25 Jan 2012 08:10:04 -0800 |
parents | 52474ec73861 (diff) cf407b7d3d78 (current diff) |
children | 9a28ddfc1f4a |
files | |
diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.cpp Wed Jan 25 09:31:47 2012 +0100 +++ b/src/share/vm/opto/memnode.cpp Wed Jan 25 08:10:04 2012 -0800 @@ -1764,7 +1764,8 @@ const Type* LoadBNode::Value(PhaseTransform *phase) const { Node* mem = in(MemNode::Memory); Node* value = can_see_stored_value(mem,phase); - if (value != NULL && value->is_Con()) { + if (value != NULL && value->is_Con() && + !value->bottom_type()->higher_equal(_type)) { // If the input to the store does not fit with the load's result type, // it must be truncated. We can't delay until Ideal call since // a singleton Value is needed for split_thru_phi optimization. @@ -1793,7 +1794,8 @@ const Type* LoadUBNode::Value(PhaseTransform *phase) const { Node* mem = in(MemNode::Memory); Node* value = can_see_stored_value(mem,phase); - if (value != NULL && value->is_Con()) { + if (value != NULL && value->is_Con() && + !value->bottom_type()->higher_equal(_type)) { // If the input to the store does not fit with the load's result type, // it must be truncated. We can't delay until Ideal call since // a singleton Value is needed for split_thru_phi optimization. @@ -1822,7 +1824,8 @@ const Type* LoadUSNode::Value(PhaseTransform *phase) const { Node* mem = in(MemNode::Memory); Node* value = can_see_stored_value(mem,phase); - if (value != NULL && value->is_Con()) { + if (value != NULL && value->is_Con() && + !value->bottom_type()->higher_equal(_type)) { // If the input to the store does not fit with the load's result type, // it must be truncated. We can't delay until Ideal call since // a singleton Value is needed for split_thru_phi optimization. @@ -1853,7 +1856,8 @@ const Type* LoadSNode::Value(PhaseTransform *phase) const { Node* mem = in(MemNode::Memory); Node* value = can_see_stored_value(mem,phase); - if (value != NULL && value->is_Con()) { + if (value != NULL && value->is_Con() && + !value->bottom_type()->higher_equal(_type)) { // If the input to the store does not fit with the load's result type, // it must be truncated. We can't delay until Ideal call since // a singleton Value is needed for split_thru_phi optimization.