src/hotspot/share/jvmci/jvmci_globals.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 78,87 ****
--- 78,96 ----
        return false;
      }
      FLAG_SET_DEFAULT(EnableJVMCI, true);
    }
  
+   if (!EnableJVMCI) {
+     // Switch off eager JVMCI initialization if JVMCI is disabled.
+     // Don't throw error if EagerJVMCI is set to allow testing.
+     if (EagerJVMCI) {
+       FLAG_SET_DEFAULT(EagerJVMCI, false);
+     }
+   }
+   JVMCI_FLAG_CHECKED(EagerJVMCI)
+ 
    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)