src/share/vm/prims/jni.cpp

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

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012 Red Hat, Inc.
   * 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
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012 Red Hat, Inc.
   * 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
*** 933,944 ****
    // each of these paths is exercized by the various jck Call[Static,Nonvirtual,][Void,Int,..]Method[A,V,] tests
  
    inline void get_long()   { _arguments->push_long(va_arg(_ap, jlong)); }
    inline void get_float()  { _arguments->push_float((jfloat)va_arg(_ap, jdouble)); } // float is coerced to double w/ va_arg
    inline void get_double() { _arguments->push_double(va_arg(_ap, jdouble)); }
!   inline void get_object() { jobject l = va_arg(_ap, jobject);
!                              _arguments->push_oop(Handle((oop *)l, false)); }
  
    inline void set_ap(va_list rap) {
      va_copy(_ap, rap);
    }
  
--- 933,943 ----
    // each of these paths is exercized by the various jck Call[Static,Nonvirtual,][Void,Int,..]Method[A,V,] tests
  
    inline void get_long()   { _arguments->push_long(va_arg(_ap, jlong)); }
    inline void get_float()  { _arguments->push_float((jfloat)va_arg(_ap, jdouble)); } // float is coerced to double w/ va_arg
    inline void get_double() { _arguments->push_double(va_arg(_ap, jdouble)); }
!   inline void get_object() { _arguments->push_jobject(va_arg(_ap, jobject)); }
  
    inline void set_ap(va_list rap) {
      va_copy(_ap, rap);
    }
  
*** 1023,1033 ****
    inline void get_int()    { _arguments->push_int((jint)(_ap++)->i); }
  
    inline void get_long()   { _arguments->push_long((_ap++)->j);  }
    inline void get_float()  { _arguments->push_float((_ap++)->f); }
    inline void get_double() { _arguments->push_double((_ap++)->d);}
!   inline void get_object() { _arguments->push_oop(Handle((oop *)(_ap++)->l, false)); }
  
    inline void set_ap(const jvalue *rap) { _ap = rap; }
  
   public:
    JNI_ArgumentPusherArray(Symbol* signature, const jvalue *rap)
--- 1022,1032 ----
    inline void get_int()    { _arguments->push_int((jint)(_ap++)->i); }
  
    inline void get_long()   { _arguments->push_long((_ap++)->j);  }
    inline void get_float()  { _arguments->push_float((_ap++)->f); }
    inline void get_double() { _arguments->push_double((_ap++)->d);}
!   inline void get_object() { _arguments->push_jobject((_ap++)->l); }
  
    inline void set_ap(const jvalue *rap) { _ap = rap; }
  
   public:
    JNI_ArgumentPusherArray(Symbol* signature, const jvalue *rap)