Mercurial > hg > truffle

diff src/share/vm/shark/sharkInliner.cpp @ 7643:3ac7d10a6572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents 606eada1bf86
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/shark/sharkInliner.cpp	Thu Jan 31 11:32:14 2013 +0100
+++ b/src/share/vm/shark/sharkInliner.cpp	Thu Jan 31 15:42:25 2013 +0100
@@ -725,7 +725,7 @@
   // Push the result if necessary
   if (is_get) {
     bool result_pushed = false;
-    if (field->is_constant()) {
+    if (field->is_constant() && field->is_static()) {
       SharkConstant *sc = SharkConstant::for_field(iter());
       if (sc->is_loaded()) {
         push(sc->is_nonzero());