--- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Tue Jan 17 17:00:22 2017 +0100
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Tue Jan 17 21:38:07 2017 -0800
@@ -1209,7 +1209,7 @@
 #if defined(COMPILER2) || INCLUDE_JVMCI
   assert(DerivedPointerTable::is_empty(), "derived pointer present");
   size_t actual_gap = pointer_delta((HeapWord*) (max_uintx-3), *(end_addr()));
-  guarantee(actual_gap > (size_t)FastAllocateSizeLimit, "inline allocation wraps");
+  guarantee(is_client_compilation_mode_vm() || actual_gap > (size_t)FastAllocateSizeLimit, "inline allocation wraps");
 #endif /* COMPILER2 || INCLUDE_JVMCI */
 
   resize_all_tlabs();