src/hotspot/share/jvmci/jvmci_globals.cpp

*** 99,10 ***
--- 99,14 ---
      if (BootstrapJVMCI && (TieredStopAtLevel < CompLevel_full_optimization)) {
        jio_fprintf(defaultStream::error_stream(),
            "-XX:+BootstrapJVMCI is not compatible with -XX:TieredStopAtLevel=%d\n", TieredStopAtLevel);
        return false;
      }
+     if (UseCompactObjectHeaders) {
+       log_warning(jvmci)("-XX:+UseCompactObjectHeaders not supported by JVMCI, disabling UseCompactObjectHeaders");
+       FLAG_SET_DEFAULT(UseCompactObjectHeaders, false);
+     }
    }
  
    if (!EnableJVMCI) {
      // Switch off eager JVMCI initialization if JVMCI is disabled.
      // Don't throw error if EagerJVMCI is set to allow testing.

*** 114,11 ***
  
    CHECK_NOT_SET(JVMCIEventLogLevel,           EnableJVMCI)
    CHECK_NOT_SET(JVMCITraceLevel,              EnableJVMCI)
    CHECK_NOT_SET(JVMCICounterSize,             EnableJVMCI)
    CHECK_NOT_SET(JVMCICountersExcludeCompiler, EnableJVMCI)
-   CHECK_NOT_SET(JVMCIUseFastLocking,          EnableJVMCI)
    CHECK_NOT_SET(JVMCINMethodSizeLimit,        EnableJVMCI)
    CHECK_NOT_SET(JVMCIPrintProperties,         EnableJVMCI)
    CHECK_NOT_SET(UseJVMCINativeLibrary,        EnableJVMCI)
    CHECK_NOT_SET(JVMCILibPath,                 EnableJVMCI)
    CHECK_NOT_SET(JVMCILibDumpJNIConfig,        EnableJVMCI)
--- 118,10 ---