*** old/src/share/vm/ci/ciField.hpp	Thu Jun  2 16:54:05 2016
--- new/src/share/vm/ci/ciField.hpp	Thu Jun  2 16:54:05 2016

*** 129,140 ****
--- 129,144 ----
    //   1. The field is both static and final
    //   2. The field is not one of the special static/final
    //      non-constant fields.  These are java.lang.System.in
    //      and java.lang.System.out.  Abomination.
    //
-   // A field is also considered constant if it is marked @Stable
    // and is non-null (or non-zero, if a primitive).
+   // - it is marked @Stable and is non-null (or non-zero, if a primitive) or
+   // - it is trusted or
+   // - it is the target field of a CallSite object.
+   //
+   // See ciField::initialize_from() for more details.
    //
    // A user should also check the field value (constant_value().is_valid()), since
    // constant fields of non-initialized classes don't have values yet.
    bool is_constant() const { return _is_constant; }
  

*** 156,165 ****
--- 160,170 ----
    //
    // Usage note: if the same field is accessed multiple times
    // in the same compilation, will_link will need to be checked
    // at each point of access.
    bool will_link(ciInstanceKlass* accessing_klass,
+                  ciMethod* accessing_method,
                   Bytecodes::Code bc);
  
    // Java access flags
    bool is_public      () const { return flags().is_public(); }
    bool is_private     () const { return flags().is_private(); }