VM build without C2 fails after JDK-8312579

--------------------------------------
how to reproduce:

./configure --with-jvm-features=-compiler2 --with-debug-level=release
make images JOBS=32

--------------------------------------
here shows the snippet of error log

=== Output from failing command(s) repeated here ===
* For target hotspot_variant-server_libjvm_objs_arguments.o:
In file included from ~/tmp/test/jdk_src/src/hotspot/share/runtime/arguments.cpp:53:
~/tmp/test/jdk_src/src/hotspot/share/runtime/arguments.cpp: In static member function 'static jint Arguments::apply_ergo()':
~/tmp/test/jdk_src/src/hotspot/share/runtime/globals_extension.hpp:35:32: error: 'Flag_EnableVectorSupport_enum' was not declared in this scope
   35 | #define FLAG_MEMBER_ENUM(name) Flag_##name##_enum
      | ^~~~~
~/tmp/test/jdk_src/src/hotspot/share/runtime/globals_extension.hpp:80:60: note: in expansion of macro 'FLAG_MEMBER_ENUM'
   80 | #define FLAG_IS_DEFAULT(name) (JVMFlag::is_default(FLAG_MEMBER_ENUM(name)))
      | ^~~~~~~~~~~~~~~~
~/tmp/test/jdk_src/src/hotspot/share/runtime/arguments.cpp:4045:8: note: in expansion of macro 'FLAG_IS_DEFAULT'
 4045 | if (!FLAG_IS_DEFAULT(EnableVectorSupport) && !EnableVectorSupport) {
      | ^~~~~~~~~~~~~~~
~/tmp/test/jdk_src/src/hotspot/share/runtime/arguments.cpp:4045:49: error: 'EnableVectorSupport' was not declared in this scope; did you mean 'VectorSupport'?
 4045 | if (!FLAG_IS_DEFAULT(EnableVectorSupport) && !EnableVectorSupport) {
      | ^~~~~~~~~~~~~~~~~~~
      | VectorSupport
   ... (rest of output omitted)
* For target hotspot_variant-server_libjvm_objs_deoptimization.o:
~/tmp/test/jdk_src/src/hotspot/share/runtime/deoptimization.cpp: In static member function 'static bool Deoptimization::realloc_objects(JavaThread*, frame*, RegisterMap*, GrowableArray<ScopeValue*>*, JavaThread*)':
~/tmp/test/jdk_src/src/hotspot/share/runtime/deoptimization.cpp:1239:13: error: 'EnableVectorSupport' was not declared in this scope; did you mean 'VectorSupport'?
 1239 | if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
      | ^~~~~~~~~~~~~~~~~~~
      | VectorSupport
~/tmp/test/jdk_src/src/hotspot/share/runtime/deoptimization.cpp: In static member function 'static void Deoptimization::reassign_fields(frame*, RegisterMap*, GrowableArray<ScopeValue*>*, bool, bool)':
~/tmp/test/jdk_src/src/hotspot/share/runtime/deoptimization.cpp:1575:9: error: 'EnableVectorSupport' was not declared in this scope; did you mean 'VectorSupport'?
 1575 | if (EnableVectorSupport && VectorSupport::is_vector(k)) {
      | ^~~~~~~~~~~~~~~~~~~
      | VectorSupport
* For target hotspot_variant-server_libjvm_objs_modules.o:
In file included from ~/tmp/test/jdk_src/src/hotspot/share/classfile/modules.cpp:48:
~/tmp/test/jdk_src/src/hotspot/share/classfile/modules.cpp: In static member function 'static void Modules::define_module(Handle, jboolean, jstring, jstring, jobjectArray, JavaThread*)':
~/tmp/test/jdk_src/src/hotspot/share/runtime/globals_extension.hpp:35:32: error: 'Flag_EnableVectorSupport_enum' was not declared in this scope
   35 | #define FLAG_MEMBER_ENUM(name) Flag_##name##_enum
      | ^~~~~
~/tmp/test/jdk_src/src/hotspot/share/runtime/globals_extension.hpp:80:60: note: in expansion of macro 'FLAG_MEMBER_ENUM'
   80 | #define FLAG_IS_DEFAULT(name) (JVMFlag::is_default(FLAG_MEMBER_ENUM(name)))
      | ^~~~~~~~~~~~~~~~
~/tmp/test/jdk_src/src/hotspot/share/classfile/modules.cpp:459:9: note: in expansion of macro 'FLAG_IS_DEFAULT'
  459 | if (FLAG_IS_DEFAULT(EnableVectorSupport)) {
      | ^~~~~~~~~~~~~~~
~/tmp/test/jdk_src/src/hotspot/share/classfile/modules.cpp:460:24: error: 'EnableVectorSupport' was not declared in this scope; did you mean 'VectorSupport'?
  460 | FLAG_SET_DEFAULT(EnableVectorSupport, true);
      | ^~~~~~~~~~~~~~~~~~~
~/tmp/test/jdk_src/src/hotspot/share/runtime/globals_extension.hpp:85:41: note: in definition of macro 'FLAG_SET_DEFAULT'
   ... (rest of output omitted)

* All command lines available in ~/tmp/test/build-release/make-support/failure-logs.
=== End of repeated output ===