--- old/src/share/vm/ci/ciField.cpp	2016-12-19 14:46:42.823378533 +0100
+++ new/src/share/vm/ci/ciField.cpp	2016-12-19 14:46:42.655378541 +0100
@@ -207,7 +207,7 @@
   // Check to see if the field is constant.
   bool is_final = this->is_final();
   bool is_stable = FoldStableValues && this->is_stable();
-  if (_holder->is_initialized() && (is_final || is_stable)) {
+  if (_holder->is_initialized() && ((is_final && !has_initialized_final_update()) || is_stable)) {
     if (!this->is_static()) {
       // A field can be constant if it's a final static field or if
       // it's a final non-static field of a trusted class (classes in