--- a/src/hotspot/share/runtime/compilationPolicy.cpp	Tue Jan 08 11:02:26 2019 +0100
+++ b/src/hotspot/share/runtime/compilationPolicy.cpp	Tue Jan 08 11:23:19 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -55,12 +55,9 @@
 
 CompilationPolicy* CompilationPolicy::_policy;
 elapsedTimer       CompilationPolicy::_accumulated_time;
-bool               CompilationPolicy::_in_vm_startup;
 
 // Determine compilation policy based on command line argument
 void compilationPolicy_init() {
-  CompilationPolicy::set_in_vm_startup(DelayCompilationDuringStartup);
-
   switch(CompilationPolicyChoice) {
   case 0:
     CompilationPolicy::set_policy(new SimpleCompPolicy());
@@ -86,13 +83,6 @@
   CompilationPolicy::policy()->initialize();
 }
 
-void CompilationPolicy::completed_vm_startup() {
-  if (TraceCompilationPolicy) {
-    tty->print("CompilationPolicy: completed vm startup.\n");
-  }
-  _in_vm_startup = false;
-}
-
 // Returns true if m must be compiled before executing it
 // This is intended to force compiles for methods (usually for
 // debugging) that would otherwise be interpreted for some reason.
@@ -184,7 +174,7 @@
 
 bool CompilationPolicy::is_compilation_enabled() {
   // NOTE: CompileBroker::should_compile_new_jobs() checks for UseCompiler
-  return !delay_compilation_during_startup() && CompileBroker::should_compile_new_jobs();
+  return CompileBroker::should_compile_new_jobs();
 }
 
 CompileTask* CompilationPolicy::select_task_helper(CompileQueue* compile_queue) {