--- old/make/hotspot/lib/JvmOverrideFiles.gmk	2018-03-09 11:06:54.000000000 -0800
+++ new/make/hotspot/lib/JvmOverrideFiles.gmk	2018-03-09 11:06:54.000000000 -0800
@@ -32,6 +32,7 @@
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
   BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+  BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
 endif
--- old/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2018-03-09 11:06:55.000000000 -0800
+++ new/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2018-03-09 11:06:55.000000000 -0800
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/javaClasses.inline.hpp"
 #include "code/scopeDesc.hpp"
 #include "memory/oopFactory.hpp"
 #include "oops/cpCache.inline.hpp"