Merge

Thu, 24 Jul 2014 18:46:55 +0000

author
drchase
date
Thu, 24 Jul 2014 18:46:55 +0000
changeset 6944
f619b069f2ca
parent 6943
55fbdf0799ae
parent 6942
f72d8917322a
child 6945
f0afba33c928

Merge

     1.1 --- a/src/share/vm/ci/ciField.cpp	Tue Mar 11 13:38:32 2014 -0400
     1.2 +++ b/src/share/vm/ci/ciField.cpp	Thu Jul 24 18:46:55 2014 +0000
     1.3 @@ -138,6 +138,17 @@
     1.4      return;
     1.5    }
     1.6  
     1.7 +  // Access check based on declared_holder. canonical_holder should not be used
     1.8 +  // to check access because it can erroneously succeed. If this check fails,
     1.9 +  // propagate the declared holder to will_link() which in turn will bail out
    1.10 +  // compilation for this field access.
    1.11 +  if (!Reflection::verify_field_access(klass->get_Klass(), declared_holder->get_Klass(), canonical_holder, field_desc.access_flags(), true)) {
    1.12 +    _holder = declared_holder;
    1.13 +    _offset = -1;
    1.14 +    _is_constant = false;
    1.15 +    return;
    1.16 +  }
    1.17 +
    1.18    assert(canonical_holder == field_desc.field_holder(), "just checking");
    1.19    initialize_from(&field_desc);
    1.20  }

mercurial