8220344: Build failures when using --with-jvm-features=-g1gc,-jfr
Reviewed-by: tschatzl, zgu
Contributed-by: Ao Qi <aoqi@loongson.cn>
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Mon Mar 11 05:09:14 2019 -0700
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Tue Mar 12 09:59:58 2019 -0400
@@ -22,7 +22,6 @@
*/
#include "precompiled.hpp"
-#include "gc/g1/g1BarrierSet.hpp"
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Mon Mar 11 05:09:14 2019 -0700
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Tue Mar 12 09:59:58 2019 -0400
@@ -26,6 +26,7 @@
#include "code/codeBlob.hpp"
#include "compiler/abstractCompiler.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "jvmci/jvmciCodeInstaller.hpp"
#include "jvmci/jvmciCompilerToVM.hpp"