# HG changeset patch
# User never
# Date 1280185087 25200
# Node ID 99ceb0e99c9ecab7e3915c0f8c72c4d3c552f631
# Parent  1890dc9151da59dbe2d877e471ada73bad0d99a8# Parent  e5dfb3ccb88b269ef208a83995793d444c8502b3
Merge

diff -r 1890dc9151da -r 99ceb0e99c9e src/share/vm/ci/ciField.cpp
--- a/src/share/vm/ci/ciField.cpp	Fri Jul 23 14:31:15 2010 -0700
+++ b/src/share/vm/ci/ciField.cpp	Mon Jul 26 15:58:07 2010 -0700
@@ -339,7 +339,7 @@
   if (_type != NULL) _type->print_name();
   else               tty->print("(reference)");
   tty->print(" is_constant=%s", bool_to_str(_is_constant));
-  if (_is_constant) {
+  if (_is_constant && is_static()) {
     tty->print(" constant_value=");
     _constant_value.print();
   }
diff -r 1890dc9151da -r 99ceb0e99c9e src/share/vm/opto/macro.cpp
--- a/src/share/vm/opto/macro.cpp	Fri Jul 23 14:31:15 2010 -0700
+++ b/src/share/vm/opto/macro.cpp	Mon Jul 26 15:58:07 2010 -0700
@@ -720,7 +720,7 @@
       if (basic_elem_type == T_OBJECT || basic_elem_type == T_ARRAY) {
         if (!elem_type->is_loaded()) {
           field_type = TypeInstPtr::BOTTOM;
-        } else if (field != NULL && field->is_constant()) {
+        } else if (field != NULL && field->is_constant() && field->is_static()) {
           // This can happen if the constant oop is non-perm.
           ciObject* con = field->constant_value().as_object();
           // Do not "join" in the previous type; it doesn't add value,