src/hotspot/share/opto/node.cpp

*** 544,553 ****
--- 544,556 ----
      n->as_Call()->clone_jvms(C);
    }
    if (n->is_SafePoint()) {
      n->as_SafePoint()->clone_replaced_nodes();
    }
+   if (n->is_ValueTypeBase()) {
+     C->add_value_type(n);
+   }
    return n;                     // Return the clone
  }
  
  //---------------------------setup_is_top--------------------------------------
  // Call this when changing the top node, to reassert the invariants
*** 622,631 ****
--- 625,637 ----
      compile->remove_range_check_cast(cast);
    }
    if (Opcode() == Op_Opaque4) {
      compile->remove_opaque4_node(this);
    }
+   if (is_ValueTypeBase()) {
+     compile->remove_value_type(this);
+   }
  
    if (is_SafePoint()) {
      as_SafePoint()->delete_replaced_nodes();
    }
    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
*** 1371,1380 ****
--- 1377,1389 ----
          igvn->C->remove_range_check_cast(cast);
        }
        if (dead->Opcode() == Op_Opaque4) {
          igvn->C->remove_opaque4_node(dead);
        }
+       if (dead->is_ValueTypeBase()) {
+         igvn->C->remove_value_type(dead);
+       }
        BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
        bs->unregister_potential_barrier_node(dead);
        igvn->C->record_dead_node(dead->_idx);
        // Kill all inputs to the dead guy
        for (uint i=0; i < dead->req(); i++) {