diff -r 0c5fc2063221 -r 0451e0a2f1f5 src/hotspot/share/code/codeCache.cpp
--- a/src/hotspot/share/code/codeCache.cpp	Mon Oct 29 17:11:46 2018 -0400
+++ b/src/hotspot/share/code/codeCache.cpp	Tue Oct 30 09:06:08 2018 +0100
@@ -274,10 +274,10 @@
   }
   // Make sure we have enough space for VM internal code
   uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
-  if (non_nmethod_size < (min_code_cache_size + code_buffers_size)) {
+  if (non_nmethod_size < min_code_cache_size) {
     vm_exit_during_initialization(err_msg(
         "Not enough space in non-nmethod code heap to run VM: " SIZE_FORMAT "K < " SIZE_FORMAT "K",
-        non_nmethod_size/K, (min_code_cache_size + code_buffers_size)/K));
+        non_nmethod_size/K, min_code_cache_size/K));
   }
 
   // Verify sizes and update flag values