src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp

rev 12692 : 8176100: [REDO][REDO] G1 Needs pre barrier on dereference of weak JNI handles
Reviewed-by:

*** 1,8 ****
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2016 SAP SE. 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) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2016, 2017 SAP SE. 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.
*** 1693,1710 ****
  
    // Check if the native method returns an oop, and if so, move it
    // from the jni handle to z_ijava_state.oop_temp. This is
    // necessary, because we reset the jni handle block below.
    // NOTE: frame::interpreter_frame_result() depends on this, too.
!   { NearLabel no_oop_result, store_oop_result;
    __ load_absolute_address(Z_R1, AbstractInterpreter::result_handler(T_OBJECT));
    __ compareU64_and_branch(Z_R1, Rresult_handler, Assembler::bcondNotEqual, no_oop_result);
!   __ compareU64_and_branch(Rlresult, (intptr_t)0L, Assembler::bcondEqual, store_oop_result);
!   __ z_lg(Rlresult, 0, Rlresult);  // unbox
!   __ bind(store_oop_result);
    __ z_stg(Rlresult, oop_tmp_offset, Z_fp);
-   __ verify_oop(Rlresult);
    __ bind(no_oop_result);
    }
  
    // Reset handle block.
    __ z_lg(Z_R1/*active_handles*/, thread_(active_handles));
--- 1693,1707 ----
  
    // Check if the native method returns an oop, and if so, move it
    // from the jni handle to z_ijava_state.oop_temp. This is
    // necessary, because we reset the jni handle block below.
    // NOTE: frame::interpreter_frame_result() depends on this, too.
!   { NearLabel no_oop_result;
    __ load_absolute_address(Z_R1, AbstractInterpreter::result_handler(T_OBJECT));
    __ compareU64_and_branch(Z_R1, Rresult_handler, Assembler::bcondNotEqual, no_oop_result);
!   __ resolve_jobject(Rlresult, /* tmp1 */ Rmethod, /* tmp2 */ Z_R1);
    __ z_stg(Rlresult, oop_tmp_offset, Z_fp);
    __ bind(no_oop_result);
    }
  
    // Reset handle block.
    __ z_lg(Z_R1/*active_handles*/, thread_(active_handles));