--- /dev/null	2018-11-30 10:10:44.238550338 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp	2018-11-30 21:08:08.150377434 +0100
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+/**
+ * Provides safe handling of out-of-memory situations during evacuation.
+ *
+ * When a Java thread encounters out-of-memory while evacuating an object in a
+ * write-barrier (i.e. it cannot copy the object to to-space), it does not necessarily
+ * follow we can return immediately from the WB (and store to from-space).
+ *
+ * In very basic case, on such failure we may wait until the the evacuation is over,
+ * and then resolve the forwarded copy, and to the store there. This is possible
+ * because other threads might still have space in their GCLABs, and successfully
+ * evacuate the object.
+ *
+ * But, there is a race due to non-atomic evac_in_progress transition. Consider
+ * thread A is stuck waiting for the evacuation to be over -- it cannot leave with
+ * from-space copy yet. Control thread drops evacuation_in_progress preparing for
+ * next STW phase that has to recover from OOME. Thread B misses that update, and
+ * successfully evacuates the object, does the write to to-copy. But, before
+ * Thread B is able to install the fwdptr, thread A discovers evac_in_progress is
+ * down, exits from here, reads the fwdptr, discovers old from-copy, and stores there.
+ * Thread B then wakes up and installs to-copy. This breaks to-space invariant, and
+ * silently corrupts the heap: we accepted two writes to separate copies of the object.
+ *
+ * The way it is solved here is to maintain a counter of threads inside the
+ * 'evacuation path'. The 'evacuation path' is the part of evacuation that does the actual
+ * allocation, copying and CASing of the copy object, and is protected by this
+ * OOM-during-evac-handler. The handler allows multiple threads to enter and exit
+ * evacuation path, but on OOME it requires all threads that experienced OOME to wait
+ * for current threads to leave, and blocks other threads from entering.
+ *
+ * Detailed state change:
+ *
+ * Upon entry of the evac-path, entering thread will attempt to increase the counter,
+ * using a CAS. Depending on the result of the CAS:
+ * - success: carry on with evac
+ * - failure:
+ *   - if offending value is a valid counter, then try again
+ *   - if offending value is OOM-during-evac special value: loop until
+ *     counter drops to 0, then exit with read-barrier
+ *
+ * Upon exit, exiting thread will decrease the counter using atomic dec.
+ *
+ * Upon OOM-during-evac, any thread will attempt to CAS OOM-during-evac
+ * special value into the counter. Depending on result:
+ *   - success: busy-loop until counter drops to zero, then exit with RB
+ *   - failure:
+ *     - offender is valid counter update: try again
+ *     - offender is OOM-during-evac: busy loop until counter drops to
+ *       zero, then exit with RB
+ */
+class ShenandoahEvacOOMHandler {
+private:
+  static const jint OOM_MARKER_MASK;
+
+  DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, sizeof(volatile jint));
+  volatile jint _threads_in_evac;
+  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_CACHE_LINE_SIZE, 0);
+
+  void wait_for_no_evac_threads();
+
+public:
+  ShenandoahEvacOOMHandler();
+
+  /**
+   * Attempt to enter the protected evacuation path.
+   *
+   * When this returns true, it is safe to continue with normal evacuation.
+   * When this method returns false, evacuation must not be entered, and caller
+   * may safely continue with a read-barrier (if Java thread).
+   */
+  void enter_evacuation();
+
+  /**
+   * Leave evacuation path.
+   */
+  void leave_evacuation();
+
+  /**
+   * Signal out-of-memory during evacuation. It will prevent any other threads
+   * from entering the evacuation path, then wait until all threads have left the
+   * evacuation path, and then return. It is then safe to continue with a read-barrier.
+   */
+  void handle_out_of_memory_during_evacuation();
+
+  void clear();
+};
+
+class ShenandoahEvacOOMScope : public StackObj {
+public:
+  ShenandoahEvacOOMScope();
+  ~ShenandoahEvacOOMScope();
+};
+
+class ShenandoahEvacOOMScopeLeaver : public StackObj {
+public:
+  ShenandoahEvacOOMScopeLeaver();
+  ~ShenandoahEvacOOMScopeLeaver();
+};
+
+#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP