*** old/src/hotspot/share/compiler/compilerDefinitions.cpp	Thu Mar 28 11:22:29 2019
--- new/src/hotspot/share/compiler/compilerDefinitions.cpp	Thu Mar 28 11:22:29 2019

*** 251,260 ****
--- 251,277 ----
      Compilation_mode = CompMode_server;
  
      if (FLAG_IS_DEFAULT(TypeProfileWidth)) {
        FLAG_SET_DEFAULT(TypeProfileWidth, 8);
      }
+     if (TieredStopAtLevel != CompLevel_full_optimization) {
+       // Currently JVMCI compiler can only work at the full optimization level
+       warning("forcing TieredStopAtLevel to full optimization because JVMCI is enabled");
+       FLAG_SET_ERGO(intx, TieredStopAtLevel, CompLevel_full_optimization);
+     }
+     if (FLAG_IS_DEFAULT(TypeProfileLevel)) {
+       FLAG_SET_DEFAULT(TypeProfileLevel, 0);
+     }
+ 
+     if (UseJVMCINativeLibrary) {
+       // SVM compiled code requires more stack space
+       if (FLAG_IS_DEFAULT(CompilerThreadStackSize)) {
+         FLAG_SET_DEFAULT(CompilerThreadStackSize, 2*M);
+       }
+     } else {
+       // Adjust the on stack replacement percentage to avoid early
+       // OSR compilations while JVMCI itself is warming up
        if (FLAG_IS_DEFAULT(OnStackReplacePercentage)) {
          FLAG_SET_DEFAULT(OnStackReplacePercentage, 933);
        }
        // JVMCI needs values not less than defaults
        if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {

*** 267,285 ****
--- 284,295 ----
          FLAG_SET_DEFAULT(MetaspaceSize, MIN2(MAX2(12*M, MetaspaceSize), MaxMetaspaceSize));
        }
        if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) {
          FLAG_SET_DEFAULT(NewSizeThreadIncrease, MAX2(4*K, NewSizeThreadIncrease));
        }
      if (TieredStopAtLevel != CompLevel_full_optimization) {
        // Currently JVMCI compiler can only work at the full optimization level
        warning("forcing TieredStopAtLevel to full optimization because JVMCI is enabled");
        FLAG_SET_ERGO(intx, TieredStopAtLevel, CompLevel_full_optimization);
      }
      if (FLAG_IS_DEFAULT(TypeProfileLevel)) {
        FLAG_SET_DEFAULT(TypeProfileLevel, 0);
      }
    }
+     } // !UseJVMCINativeLibrary
+   } // UseJVMCICompiler
  }
  #endif // INCLUDE_JVMCI
  
  bool CompilerConfig::check_args_consistency(bool status) {
    // Check lower bounds of the code cache

*** 390,399 ****
--- 400,411 ----
  
  #if INCLUDE_JVMCI
    // Check that JVMCI compiler supports selested GC.
    // Should be done after GCConfig::initialize() was called.
    JVMCIGlobals::check_jvmci_supported_gc();
+ 
+   // Do JVMCI specific settings
    set_jvmci_specific_flags();
  #endif
  
    if (TieredCompilation) {
      set_tiered_flags();