src/cpu/x86/vm/jniFastGetField_x86_64.cpp

*** 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.
*** 78,87 ****
--- 78,90 ----
      __ xorptr(robj, rcounter);
      __ xorptr(robj, rcounter);                  // obj, since
                                                  // robj ^ rcounter ^ rcounter == robj
                                                  // robj is data dependent on rcounter.
    }
+ 
+   __ clear_jweak_tag(robj);
+ 
    __ movptr(robj, Address(robj, 0));            // *obj
    __ mov   (roffset, c_rarg2);
    __ shrptr(roffset, 2);                        // offset
  
    assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
*** 176,185 ****
--- 179,191 ----
      __ xorptr(robj, rcounter);
      __ xorptr(robj, rcounter);                  // obj, since
                                                  // robj ^ rcounter ^ rcounter == robj
                                                  // robj is data dependent on rcounter.
    }
+ 
+   __ clear_jweak_tag(robj);
+ 
    __ movptr(robj, Address(robj, 0));            // *obj
    __ mov   (roffset, c_rarg2);
    __ shrptr(roffset, 2);                        // offset
  
    assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");