# HG changeset patch
# User aph
# Date 1466699254 0
# Node ID ecedc976bb8b0b8bc9b48db9a6481f7a179c85aa
# Parent  40460a932140cc627477af77f11afaee781e0d9a
8160189: Fix for 8159335 breaks AArch64
Reviewed-by: kvn

diff -r 40460a932140 -r ecedc976bb8b hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
--- a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Wed Jun 22 14:03:01 2016 +0200
+++ b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Thu Jun 23 16:27:34 2016 +0000
@@ -682,7 +682,7 @@
   __ mov(r0, overhead_size);
   __ add(r0, r0, r3, Assembler::LSL, Interpreter::logStackElementSize);  // 2 slots per parameter.
 
-  const Address stack_limit(rthread, Thread::stack_overflow_limit_offset());
+  const Address stack_limit(rthread, JavaThread::stack_overflow_limit_offset());
   __ ldr(rscratch1, stack_limit);
 
 #ifdef ASSERT
@@ -690,7 +690,7 @@
   // Verify that thread stack limit is non-zero.
   __ cbnz(rscratch1, limit_okay);
   __ stop("stack overflow limit is zero");
-  __ bind(stack_base_okay);
+  __ bind(limit_okay);
 #endif
 
   // Add stack limit to locals.