diff -r cd4ac076bf7f -r a0910b1d3e0d hotspot/src/share/vm/runtime/deoptimization.cpp
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Fri Dec 11 13:18:10 2015 +0000
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Fri Dec 11 09:07:07 2015 -0800
@@ -1431,7 +1431,7 @@
     // stack bang causes a stack overflow we crash.
     assert(THREAD->is_Java_thread(), "only a java thread can be here");
     JavaThread* thread = (JavaThread*)THREAD;
-    bool guard_pages_enabled = thread->stack_yellow_zone_enabled();
+    bool guard_pages_enabled = thread->stack_guards_enabled();
     if (!guard_pages_enabled) guard_pages_enabled = thread->reguard_stack();
     assert(guard_pages_enabled, "stack banging in uncommon trap blob may cause crash");
   }