src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp

rev 8531 : 8129757: ppc/aarch: Fix passing thread to runtime after "8073165: Contended Locking fast exit bucket."
Reviewed-by: enevill

*** 1,8 ****
  /*
!  * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,8 ----
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 2118,2136 ****
  
      if (ret_type == T_FLOAT || ret_type == T_DOUBLE ) {
        save_native_result(masm, ret_type, stack_slots);
      }
  
      __ lea(c_rarg1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size));
      __ mov(c_rarg0, obj_reg);
  
      // Save pending exception around call to VM (which contains an EXCEPTION_MARK)
      // NOTE that obj_reg == r19 currently
      __ 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);
  
  #ifdef ASSERT
      {
        Label L;
        __ ldr(rscratch1, Address(rthread, in_bytes(Thread::pending_exception_offset())));
--- 2118,2137 ----
  
      if (ret_type == T_FLOAT || ret_type == T_DOUBLE ) {
        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);
  
      // Save pending exception around call to VM (which contains an EXCEPTION_MARK)
      // NOTE that obj_reg == r19 currently
      __ 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), 3, 0, 1);
  
  #ifdef ASSERT
      {
        Label L;
        __ ldr(rscratch1, Address(rthread, in_bytes(Thread::pending_exception_offset())));