Mercurial > hg > icedtea8-forest > hotspot

changeset 10804:d06ea5129bd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8161072, PR3797: AArch64: jtreg compiler/uncommontrap/TestDeoptOOM failure Reviewed-by: roland
author aph
date Fri, 08 Jul 2016 17:11:37 +0100
parents c8c10298f00a
children e1f00b506d78
files src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp
diffstat 1 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	Tue Oct 27 06:33:36 2020 +0000
+++ b/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	Fri Jul 08 17:11:37 2016 +0100
@@ -213,19 +213,6 @@
   __ restore_locals();
   __ restore_constant_pool_cache();
   __ get_method(rmethod);
-
-  // handle exceptions
-  {
-    Label L;
-    __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
-    __ cbz(rscratch1, L);
-    __ call_VM(noreg,
-               CAST_FROM_FN_PTR(address,
-                                InterpreterRuntime::throw_pending_exception));
-    __ should_not_reach_here();
-    __ bind(L);
-  }
-
   __ get_dispatch();
 
   // Calculate stack limit
@@ -243,6 +230,18 @@
   // NULL last_sp until next java call
   __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
 
+  // handle exceptions
+  {
+    Label L;
+    __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
+    __ cbz(rscratch1, L);
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address,
+                                InterpreterRuntime::throw_pending_exception));
+    __ should_not_reach_here();
+    __ bind(L);
+  }
+
   __ dispatch_next(state, step);
   return entry;
 }