Mercurial > hg > graal-compiler
changeset 1682:e5dfb3ccb88b
6969569: assert(is_static() && is_constant()) failed: illegal call to constant_value()
Summary: Add missing is_static guard.
Reviewed-by: twisti
author | kvn |
---|---|
date | Fri, 23 Jul 2010 10:07:46 -0700 |
parents | 7139e81efd2d |
children | 99ceb0e99c9e |
files | src/share/vm/ci/ciField.cpp src/share/vm/opto/macro.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/ci/ciField.cpp Thu Jul 22 15:29:22 2010 -0700 +++ b/src/share/vm/ci/ciField.cpp Fri Jul 23 10:07:46 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(); }
--- a/src/share/vm/opto/macro.cpp Thu Jul 22 15:29:22 2010 -0700 +++ b/src/share/vm/opto/macro.cpp Fri Jul 23 10:07:46 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,