Automatic merge of jdk:master into master

openjdk · Nov 8, 2020 · 2b25efc · 2b25efc
2 parents 682cc58 + f39a2c8
commit 2b25efc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
@@ -384,6 +384,11 @@ WB_ENTRY(jboolean, WB_isObjectInOldGen(JNIEnv* env, jobject o, jobject obj))
   if (UseZGC) {
     return Universe::heap()->is_in(p);
   }
+#endif
+#if INCLUDE_SHENANDOAHGC
+  if (UseShenandoahGC) {
+    return Universe::heap()->is_in(p);
+  }
 #endif
   GenCollectedHeap* gch = GenCollectedHeap::heap();
   return !gch->is_in_young(p);