--- old/src/hotspot/share/interpreter/rewriter.cpp	2019-04-24 13:36:06.000000000 -0700
+++ new/src/hotspot/share/interpreter/rewriter.cpp	2019-04-24 13:36:06.000000000 -0700
@@ -449,11 +449,11 @@
             if (klass->find_field(field_name, field_sig, &fd) != NULL) {
               if (fd.access_flags().is_final()) {
                 if (fd.access_flags().is_static()) {
-                  if (!method->is_static_initializer()) {
+                  if (!method->is_class_initializer()) {
                     fd.set_has_initialized_final_update(true);
                   }
                 } else {
-                  if (!method->is_object_initializer()) {
+                  if (!method->is_object_constructor()) {
                     fd.set_has_initialized_final_update(true);
                   }
                 }