src/hotspot/share/opto/graphKit.hpp

*** 590,600 ****
                          const TypePtr* adr_type,
                          Node* val,
                          const Type* val_type,
                          BasicType bt,
                          DecoratorSet decorators,
!                         bool deoptimize_on_exception = false);
  
    Node* access_load_at(Node* obj,   // containing obj
                         Node* adr,   // actual adress to load val at
                         const TypePtr* adr_type,
                         const Type* val_type,
--- 590,601 ----
                          const TypePtr* adr_type,
                          Node* val,
                          const Type* val_type,
                          BasicType bt,
                          DecoratorSet decorators,
!                         bool deoptimize_on_exception = false,
!                         bool safe_for_replace = true);
  
    Node* access_load_at(Node* obj,   // containing obj
                         Node* adr,   // actual adress to load val at
                         const TypePtr* adr_type,
                         const Type* val_type,
*** 846,856 ****
    // and the array-store bytecode
    Node* gen_checkcast(Node *subobj, Node* superkls, Node* *failure_control = NULL, bool never_null = false);
  
    Node* is_always_locked(Node* obj);
    void gen_value_type_guard(Node* obj, int nargs = 0);
!   void gen_value_type_array_guard(Node* ary, Node* obj, int nargs);
    Node* load_lh_array_tag(Node* kls);
    Node* gen_lh_array_test(Node* kls, unsigned int lh_value);
  
    Node* gen_subtype_check(Node* subklass, Node* superklass) {
      MergeMemNode* mem = merged_memory();
--- 847,857 ----
    // and the array-store bytecode
    Node* gen_checkcast(Node *subobj, Node* superkls, Node* *failure_control = NULL, bool never_null = false);
  
    Node* is_always_locked(Node* obj);
    void gen_value_type_guard(Node* obj, int nargs = 0);
!   void gen_value_array_null_guard(Node* ary, Node* val, int nargs);
    Node* load_lh_array_tag(Node* kls);
    Node* gen_lh_array_test(Node* kls, unsigned int lh_value);
  
    Node* gen_subtype_check(Node* subklass, Node* superklass) {
      MergeMemNode* mem = merged_memory();