src/share/vm/prims/whitebox.cpp

rev 9277 : imported patch 8140597-forcing-initial-mark-causes-abort-mixed-collections

@@ -320,12 +320,12 @@
   size_t nr = g1->num_free_regions();
   return (jlong)nr;
 WB_END
 
 WB_ENTRY(jboolean, WB_G1InConcurrentMark(JNIEnv* env, jobject o))
-  G1CollectedHeap* g1 = G1CollectedHeap::heap();
-  return g1->concurrent_mark()->cmThread()->during_cycle();
+  G1CollectedHeap* g1h = G1CollectedHeap::heap();
+  return g1h->concurrent_mark()->cmThread()->during_cycle();
 WB_END
 
 WB_ENTRY(jboolean, WB_G1StartMarkCycle(JNIEnv* env, jobject o))
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
   if (!g1h->concurrent_mark()->cmThread()->during_cycle()) {