--- a/src/hotspot/share/compiler/compileBroker.cpp	Sun Jan 20 11:13:13 2019 +0100
+++ b/src/hotspot/share/compiler/compileBroker.cpp	Sun Jan 20 16:55:21 2019 +0100
@@ -2212,15 +2212,6 @@
   // the point somewhat) our clearing of the bits must be occurring
   // only after the setting of the bits. See also 14012000 above.
   method->clear_queued_for_compilation();
-
-#ifdef ASSERT
-  if (CollectedHeap::fired_fake_oom()) {
-    // The current compile received a fake OOM during compilation so
-    // go ahead and exit the VM since the test apparently succeeded
-    tty->print_cr("*** Shutting down VM after successful fake OOM");
-    vm_exit(0);
-  }
-#endif
 }
 
 /**

--- a/src/hotspot/share/gc/shared/collectedHeap.cpp	Sun Jan 20 11:13:13 2019 +0100
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp	Sun Jan 20 16:55:21 2019 +0100
@@ -51,10 +51,6 @@
 
 class ClassLoaderData;
 
-#ifdef ASSERT
-int CollectedHeap::_fire_out_of_memory_count = 0;
-#endif
-
 size_t CollectedHeap::_filler_array_max_size = 0;
 
 template <>

--- a/src/hotspot/share/gc/shared/collectedHeap.hpp	Sun Jan 20 11:13:13 2019 +0100
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp	Sun Jan 20 16:55:21 2019 +0100
@@ -100,10 +100,6 @@
   friend class MemAllocator;
 
  private:
-#ifdef ASSERT
-  static int       _fire_out_of_memory_count;
-#endif
-
   GCHeapLog* _gc_heap_log;
 
   MemRegion _reserved;
@@ -600,12 +596,6 @@
   void reset_promotion_should_fail(volatile size_t* count);
   void reset_promotion_should_fail();
 #endif  // #ifndef PRODUCT
-
-#ifdef ASSERT
-  static int fired_fake_oom() {
-    return (CIFireOOMAt > 1 && _fire_out_of_memory_count >= CIFireOOMAt);
-  }
-#endif
 };
 
 // Class to set and reset the GC cause for a CollectedHeap.

--- a/src/hotspot/share/runtime/globals.hpp	Sun Jan 20 11:13:13 2019 +0100
+++ b/src/hotspot/share/runtime/globals.hpp	Sun Jan 20 16:55:21 2019 +0100
@@ -1994,10 +1994,6 @@
   product(bool, CICompilerCountPerCPU, false,                               \
           "1 compiler thread for log(N CPUs)")                              \
                                                                             \
-  develop(intx, CIFireOOMAt,    -1,                                         \
-          "Fire OutOfMemoryErrors throughout CI for testing the compiler "  \
-          "(non-negative value throws OOM after this many CI accesses "     \
-          "in each compile)")                                               \
   notproduct(intx, CICrashAt, -1,                                           \
           "id of compilation to trigger assert in compiler thread for "     \
           "the purpose of testing, e.g. generation of replay data")         \