[aarch64-port-dev ] Fix on aarch required after 8073165: Contended Locking fast exit bucket.

[Lindenmaier, Goetz]

Hi,

I think you need the fix below after the change in 8073165.
http://hg.openjdk.java.net/jdk9/dev/hotspot/rev/2abcd8a4896c
If you verify this, I will submit it along with the ppc fix.

Best regards,
  Goetz.

diff -r 5b5db3d68ab9 src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
--- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp      Mon Jun 22 17:15:45 2015 +0200
+++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp      Tue Jun 23 08:54:15 2015 +0200
@@ -2120,6 +2120,7 @@
       save_native_result(masm, ret_type, stack_slots);
     }

+    __ mov(c_rarg2, rthread);
     __ lea(c_rarg1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
     __ mov(c_rarg0, obj_reg);

@@ -2128,7 +2129,7 @@
     __ ldr(r19, Address(rthread, in_bytes(Thread::pending_exception_offset())));
     __ str(zr, Address(rthread, in_bytes(Thread::pending_exception_offset())));

-    rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C), 2, 0, 1);
+    rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C), 3, 0, 1);

#ifdef ASSERT
     {