# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1421798815 -3600
# Node ID 17700eb91e420670b9e7ace30affe884c565aef2
# Parent  1ef0e3bb0a215294e064f51ea74e742a59df1377
Don't attempt to evacuate anything if evacuation has been cancelled.

diff -r 1ef0e3bb0a21 -r 17700eb91e42 src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	Mon Jan 19 17:31:19 2015 +0100
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	Wed Jan 21 01:06:55 2015 +0100
@@ -2324,6 +2324,11 @@
 
   assert(! heap_region_containing(p)->is_humonguous(), "never evacuate humonguous objects");
 
+  // Don't even attempt to evacuate anything if evacuation has been cancelled.
+  if (_cancelled_evacuation) {
+    return ShenandoahBarrierSet::resolve_oop_static(p);
+  }
+
   bool alloc_from_gclab = true;
   HeapWord* filler = allocate_from_gclab(thread, required);
   if (filler == NULL) {