--- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Jan 22 13:52:02 2015 +0100
+++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Jan 22 15:18:31 2015 +0100
@@ -35,35 +35,6 @@
 #include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
 
-#ifdef ASSERT
-#include "gc_implementation/shenandoah/shenandoahHeap.hpp"
-#include "gc_implementation/shenandoah/shenandoahHeapRegion.hpp"
-
-void C1_MacroAssembler::check_obj_shenandoah(Register obj, const char* err_msg) {
-  if (UseShenandoahGC) {
-    Label done;
-    push(rscratch1);
-    push(rscratch2);
-
-    testptr(obj, obj);
-    jcc(Assembler::zero, done);
-
-    movptr(rscratch1, obj);
-    shrq(rscratch1, ShenandoahHeapRegion::RegionSizeShift);
-    movptr(rscratch2, (intptr_t) ShenandoahHeap::in_cset_fast_test_addr());
-    cmpb(Address(rscratch2, rscratch1, Address::times_1), 0);
-    jcc(Assembler::equal, done);
-
-    stop(err_msg);
-
-    bind(done);
-
-    pop(rscratch2);
-    pop(rscratch1);
-  }
-}
-#endif
-
 int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Register scratch, Label& slow_case) {
   const int aligned_mask = BytesPerWord -1;
   const int hdr_offset = oopDesc::mark_offset_in_bytes();
@@ -72,10 +43,6 @@
   Label done;
   int null_check_offset = -1;
 
-#ifdef ASSERT
-  check_obj_shenandoah(obj, "attempted lock of from-space object");
-#endif
-
   verify_oop(obj);
 
   // save object being locked into the BasicObjectLock
@@ -142,10 +109,6 @@
     // load object
     movptr(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
 
-#ifdef ASSERT
-    check_obj_shenandoah(obj, "attempted biased unlock of from-space object");
-#endif
-
     biased_locking_exit(obj, hdr, done);
   }
 
@@ -158,9 +121,6 @@
   if (!UseBiasedLocking) {
     // load object
     movptr(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
-#ifdef ASSERT
-    check_obj_shenandoah(obj, "attempted unlock of from-space object");
-#endif
   }
   verify_oop(obj);
   // test if object header is pointing to the displaced header, and if so, restore

--- a/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp	Thu Jan 22 13:52:02 2015 +0100
+++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp	Thu Jan 22 15:18:31 2015 +0100
@@ -117,8 +117,4 @@
 
   void invalidate_registers(bool inv_rax, bool inv_rbx, bool inv_rcx, bool inv_rdx, bool inv_rsi, bool inv_rdi) PRODUCT_RETURN;
 
-#ifdef ASSERT
-void check_obj_shenandoah(Register obj, const char* err_msg);
-#endif
-
 #endif // CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP