--- a/hotspot/src/cpu/zero/vm/frame_zero.cpp	Fri Apr 01 12:32:34 2016 -0700
+++ b/hotspot/src/cpu/zero/vm/frame_zero.cpp	Mon May 02 17:46:08 2016 +0000
@@ -360,7 +360,7 @@
   case pc_off:
     strncpy(fieldbuf, "pc", buflen);
     if (method()->is_method()) {
-      nmethod *code = method()->code();
+      CompiledMethod *code = method()->code();
       if (code && code->pc_desc_at(pc())) {
         SimpleScopeDesc ssd(code, pc());
         snprintf(valuebuf, buflen, PTR_FORMAT " (bci %d)",

--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Fri Apr 01 12:32:34 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Mon May 02 17:46:08 2016 +0000
@@ -3106,6 +3106,8 @@
   SvcGCMarker sgcm(SvcGCMarker::MINOR);
   ResourceMark rm;
 
+  g1_policy()->note_gc_start();
+
   wait_for_root_region_scanning();
 
   print_heap_before_gc();
@@ -3165,8 +3167,6 @@
                                                                   Threads::number_of_non_daemon_threads());
     workers()->set_active_workers(active_workers);
 
-    g1_policy()->note_gc_start();
-
     TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
     TraceMemoryManagerStats tms(false /* fullGC */, gc_cause());