From cdb487a6fda936a89bdf0eacd578fe876bdece17 Mon Sep 17 00:00:00 2001
From: Hao Sun <hao.sun@arm.com>
Date: Wed, 23 Dec 2020 23:14:37 +0000
Subject: [PATCH] 8258856: VM build without C1/C2 fails after JDK-8243205

Reviewed-by: jiefu, kvn
---
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp      | 3 +++
 src/hotspot/share/compiler/oopMap.cpp             | 3 +++
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index fd3b67de383..7cd48bd9583 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -46,6 +46,9 @@
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci_globals.hpp"
+#endif
 #if INCLUDE_ZGC
 #include "gc/z/zThreadLocalData.hpp"
 #endif
diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index 35e678025ce..18e3269d495 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -46,6 +46,9 @@
 #ifdef COMPILER2
 #include "opto/optoreg.hpp"
 #endif
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci_globals.hpp"
+#endif
 
 // OopMapStream
 
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 964aee225e1..b6300db9130 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -23,6 +23,7 @@
 
 // no precompiled headers
 #include "ci/ciUtilities.hpp"
+#include "compiler/compiler_globals.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"