src/hotspot/share/c1/c1_ValueMap.hpp

*** 145,10 ***
--- 145,13 ---
          // but possible future optimizations might require this.
          x->field()->is_volatile()) {
        kill_memory();
      } else {
        kill_field(x->field(), x->needs_patching());
+       if (x->enclosing_field() != nullptr) {
+         kill_field(x->enclosing_field(), true);
+       }
      }
    }
    void do_StoreIndexed   (StoreIndexed*    x) { kill_array(x->type()); }
    void do_MonitorEnter   (MonitorEnter*    x) { kill_memory(); }
    void do_MonitorExit    (MonitorExit*     x) { kill_memory(); }

*** 204,10 ***
--- 207,11 ---
    void do_OsrEntry       (OsrEntry*        x) { /* nothing to do */ }
    void do_ExceptionObject(ExceptionObject* x) { /* nothing to do */ }
    void do_RoundFP        (RoundFP*         x) { /* nothing to do */ }
    void do_ProfileCall    (ProfileCall*     x) { /* nothing to do */ }
    void do_ProfileReturnType (ProfileReturnType*  x) { /* nothing to do */ }
+   void do_ProfileACmpTypes(ProfileACmpTypes*  x) { /* nothing to do */ }
    void do_ProfileInvoke  (ProfileInvoke*   x) { /* nothing to do */ };
    void do_RuntimeCall    (RuntimeCall*     x) { /* nothing to do */ };
    void do_MemBar         (MemBar*          x) { /* nothing to do */ };
    void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ };
  #ifdef ASSERT