diff -r 8333d76c7fee -r 62c12ca7a45e hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
--- a/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp	Tue Jan 12 16:01:54 2016 +0100
+++ b/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp	Tue Jan 12 13:14:41 2016 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -49,11 +49,10 @@
 // value can be negative.
 inline int ZeroStack::abi_stack_available(Thread *thread) const {
   guarantee(Thread::current() == thread, "should run in the same thread");
-  assert(thread->stack_size() -
-         (thread->stack_base() - (address) &stack_used +
-          JavaThread::stack_guard_zone_size() + JavaThread::stack_shadow_zone_size()) ==
-         (address)&stack_used - thread->stack_overflow_limit(), "sanity");
-  return (address)&stack_used - stack_overflow_limit();
+  int stack_used = thread->stack_base() - (address) &stack_used
+    + (JavaThread::stack_guard_zone_size() + JavaThread::stack_shadow_zone_size());
+  int stack_free = thread->stack_size() - stack_used;
+  return stack_free;
 }
 
 #endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP