aboutsummaryrefslogtreecommitdiff
path: root/src/share/vm/c1
diff options
context:
space:
mode:
authorrbackman <none@none>2013-08-27 19:37:39 +0200
committerrbackman <none@none>2013-08-27 19:37:39 +0200
commit49dac8a12fff422315c99ee0c0e35210cf822777 (patch)
tree1ee8d0bebc8617a1b9c418b245ac97cd5547d43f /src/share/vm/c1
parent13a047400b40f18e1ea10a447d9e333cc3d5212c (diff)
parent015eba2133cf1baf1348c539740154c408a625f3 (diff)
Merge
Diffstat (limited to 'src/share/vm/c1')
-rw-r--r--src/share/vm/c1/c1_GraphBuilder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/share/vm/c1/c1_GraphBuilder.cpp b/src/share/vm/c1/c1_GraphBuilder.cpp
index 1d0b9243d..b7ea6eebb 100644
--- a/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1583,7 +1583,7 @@ void GraphBuilder::access_field(Bytecodes::Code code) {
ObjectType* obj_type = obj->type()->as_ObjectType();
if (obj_type->is_constant() && !PatchALot) {
ciObject* const_oop = obj_type->constant_value();
- if (!const_oop->is_null_object()) {
+ if (!const_oop->is_null_object() && const_oop->is_loaded()) {
if (field->is_constant()) {
ciConstant field_val = field->constant_value_of(const_oop);
BasicType field_type = field_val.basic_type();