Automatic merge of jdk:master into master

Author: duke

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);