*** 32,10 *** --- 32,11 --- #include "opto/ad.hpp" #include "opto/callGenerator.hpp" #include "opto/castnode.hpp" #include "opto/cfgnode.hpp" #include "opto/connode.hpp" + #include "opto/inlinetypenode.hpp" #include "opto/loopnode.hpp" #include "opto/machnode.hpp" #include "opto/matcher.hpp" #include "opto/node.hpp" #include "opto/opcodes.hpp"
*** 558,10 *** --- 559,13 --- // Scalar replacement and macro expansion might modify the JVMState. // Clone it to make sure it's not shared between SafePointNodes. n->as_SafePoint()->clone_jvms(C); n->as_SafePoint()->clone_replaced_nodes(); } + if (n->is_InlineType()) { + C->add_inline_type(n); + } Compile::current()->record_modified_node(n); return n; // Return the clone } //---------------------------setup_is_top--------------------------------------
*** 618,10 *** --- 622,13 --- compile->remove_parse_predicate(as_ParsePredicate()); } if (for_post_loop_opts_igvn()) { compile->remove_from_post_loop_opts_igvn(this); } + if (is_InlineType()) { + compile->remove_inline_type(this); + } if (is_SafePoint()) { as_SafePoint()->delete_replaced_nodes(); if (is_CallStaticJava()) {