src/cpu/x86/vm/jniFastGetField_x86_32.cpp

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

*** 1,7 ****
  /*
!  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. 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,7 ----
  /*
!  * Copyright (c) 2004, 2017, Oracle and/or its affiliates. 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.
*** 83,92 ****
--- 83,95 ----
                                                // rdx is data dependent on rcx.
    } else {
      __ movptr (rdx, Address(rsp, 2*wordSize));  // obj
    }
    __ movptr(rax, Address(rsp, 3*wordSize));  // jfieldID
+ 
+   __ clear_jweak_tag(rdx);
+ 
    __ movptr(rdx, Address(rdx, 0));           // *obj
    __ shrptr (rax, 2);                         // offset
  
    assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
    speculative_load_pclist[count] = __ pc();
*** 200,209 ****
--- 203,215 ----
                                                // rdx is data dependent on rcx.
    } else {
      __ movptr(rdx, Address(rsp, 3*wordSize));  // obj
    }
    __ movptr(rsi, Address(rsp, 4*wordSize));  // jfieldID
+ 
+   __ clear_jweak_tag(rdx);
+ 
    __ movptr(rdx, Address(rdx, 0));           // *obj
    __ shrptr(rsi, 2);                         // offset
  
    assert(count < LIST_CAPACITY-1, "LIST_CAPACITY too small");
    speculative_load_pclist[count++] = __ pc();
*** 289,298 ****
--- 295,307 ----
                                                // rdx is data dependent on rcx.
    } else {
      __ movptr(rdx, Address(rsp, 2*wordSize)); // obj
    }
    __ movptr(rax, Address(rsp, 3*wordSize));  // jfieldID
+ 
+   __ clear_jweak_tag(rdx);
+ 
    __ movptr(rdx, Address(rdx, 0));           // *obj
    __ shrptr(rax, 2);                         // offset
  
    assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
    speculative_load_pclist[count] = __ pc();