--- old/src/share/vm/asm/assembler.cpp	2015-10-14 13:53:45.513583580 +0200
+++ new/src/share/vm/asm/assembler.cpp	2015-10-14 13:53:45.415585950 +0200
@@ -26,6 +26,7 @@
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
+#include "gc/shenandoah/brooksPointer.hpp"
 #include "runtime/atomic.inline.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/os.hpp"
@@ -312,5 +313,5 @@
     }
   }
 #endif
-  return offset < 0 || os::vm_page_size() <= offset;
+  return (offset < 0 && ((!UseShenandoahGC) || offset != BrooksPointer::BYTE_OFFSET)) || os::vm_page_size() <= offset;
 }