--- old/src/hotspot/share/runtime/jniHandles.cpp	2019-03-28 11:23:16.000000000 -0700
+++ new/src/hotspot/share/runtime/jniHandles.cpp	2019-03-28 11:23:16.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
 
 #include "precompiled.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci.hpp"
+#endif
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
 #include "oops/access.inline.hpp"
@@ -121,7 +124,6 @@
   return res;
 }
 
-
 jobject JNIHandles::make_weak_global(Handle obj, AllocFailType alloc_failmode) {
   assert(!Universe::heap()->is_gc_active(), "can't extend the root set during GC");
   assert(!current_thread_in_native(), "must not be in native");
@@ -187,6 +189,9 @@
 
 void JNIHandles::oops_do(OopClosure* f) {
   global_handles()->oops_do(f);
+#if INCLUDE_JVMCI
+  JVMCI::oops_do(f);
+#endif
 }