--- old/src/share/vm/runtime/deoptimization.cpp	2015-11-23 18:21:03.845218371 +0100
+++ new/src/share/vm/runtime/deoptimization.cpp	2015-11-23 18:21:03.669200673 +0100
@@ -1391,7 +1391,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");
   }