archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 12:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6969569: assert(is_static() && is_constant()) failed: illegal call to constant_value()

Browse source 
Add missing is_static guard.

Reviewed-by: twisti
This commit is contained in:
Vladimir Kozlov 2010-07-23 10:07:46 -07:00
parent 762e078636
commit 3fbdd52bdf
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/opto/macro.cpp
View file

@ -720,7 +720,7 @@ bool PhaseMacroExpand::scalar_replacement(AllocateNode *alloc, GrowableArray <Sa
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,