--- old/src/hotspot/share/runtime/thread.inline.hpp	Tue Nov 14 05:34:59 2017
+++ new/src/hotspot/share/runtime/thread.inline.hpp	Tue Nov 14 05:34:57 2017
@@ -156,7 +156,8 @@
 
 inline bool JavaThread::stack_guards_enabled() {
 #ifdef ASSERT
-  if (os::uses_stack_guard_pages()) {
+  if (os::uses_stack_guard_pages() &&
+      !(DisablePrimordialThreadGuardPages && os::is_primordial_thread())) {
     assert(_stack_guard_state != stack_guard_unused, "guard pages must be in use");
   }
 #endif