# HG changeset patch
# User drchase
# Date 1406227615 0
# Node ID f619b069f2ca1fa2243360109d6d23b92031dd2e
# Parent  55fbdf0799ae99c25f8f726be6975b6a036b98fe# Parent  f72d8917322a12f24407a0257885ea44b88c60b7
Merge

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