hg: jdk8u/jdk8u-jfr-incubator/hotspot: 8229873: 8229401 broke jdk8u-jfr-incubator

[neugens at redhat.com]

Changeset: f162232da105
Author:    shade
Date:      2019-08-19 12:47 +0200
URL:       https://hg.openjdk.java.net/jdk8u/jdk8u-jfr-incubator/hotspot/rev/f162232da105

8229873: 8229401 broke jdk8u-jfr-incubator
Reviewed-by: neugens

! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/jfr/recorder/checkpoint/types/jfrType.cpp