Mercurial > hg > truffle
comparison src/share/vm/shark/sharkInliner.cpp @ 7643:3ac7d10a6572
Merge with hsx25/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 31 Jan 2013 15:42:25 +0100 |
parents | 606eada1bf86 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
7573:17b6a63fe7c2 | 7643:3ac7d10a6572 |
---|---|
723 } | 723 } |
724 | 724 |
725 // Push the result if necessary | 725 // Push the result if necessary |
726 if (is_get) { | 726 if (is_get) { |
727 bool result_pushed = false; | 727 bool result_pushed = false; |
728 if (field->is_constant()) { | 728 if (field->is_constant() && field->is_static()) { |
729 SharkConstant *sc = SharkConstant::for_field(iter()); | 729 SharkConstant *sc = SharkConstant::for_field(iter()); |
730 if (sc->is_loaded()) { | 730 if (sc->is_loaded()) { |
731 push(sc->is_nonzero()); | 731 push(sc->is_nonzero()); |
732 result_pushed = true; | 732 result_pushed = true; |
733 } | 733 } |