--- a/hotspot/src/share/vm/prims/whitebox.cpp	Fri Nov 06 11:11:51 2015 -0800
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Wed Nov 11 23:47:41 2015 +0000
@@ -322,8 +322,8 @@
 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))