Mercurial > hg > graal-jvmci-8

changeset 23755:37a27e859428

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring over missing null check from JDK9
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 21 Sep 2016 19:37:02 -0700
parents d0008e893639
children d64936a16a13
files jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Mon Sep 19 15:47:00 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Wed Sep 21 19:37:02 2016 -0700
@@ -76,7 +76,7 @@
             HotSpotVMConfigStore store = runtime.getConfigStore();
             for (Map.Entry<String, VMField> e : store.getFields().entrySet()) {
                 VMField field = e.getValue();
-                if (field.isStatic() && field.value == address) {
+                if (field.isStatic() && field.value != null && field.value == address) {
                     return e.getValue() + ":0x" + Long.toHexString(address);
                 }
             }