src/share/vm/code/dependencies.hpp

*** 171,181 ****
      all_types           = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE),
  
      non_klass_types     = (1 << call_site_target_value),
      klass_types         = all_types & ~non_klass_types,
  
!     non_ctxk_types      = (1 << evol_method),
      implicit_ctxk_types = 0,
      explicit_ctxk_types = all_types & ~(non_ctxk_types | implicit_ctxk_types),
  
      max_arg_count = 3,   // current maximum number of arguments (incl. ctxk)
  
--- 171,181 ----
      all_types           = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE),
  
      non_klass_types     = (1 << call_site_target_value),
      klass_types         = all_types & ~non_klass_types,
  
!     non_ctxk_types      = (1 << evol_method) | (1 << call_site_target_value),
      implicit_ctxk_types = 0,
      explicit_ctxk_types = all_types & ~(non_ctxk_types | implicit_ctxk_types),
  
      max_arg_count = 3,   // current maximum number of arguments (incl. ctxk)
  
*** 328,338 ****
    static Klass* check_abstract_with_exclusive_concrete_subtypes(Klass* ctxk, Klass* k1, Klass* k2,
                                                                    KlassDepChange* changes = NULL);
    static Klass* check_exclusive_concrete_methods(Klass* ctxk, Method* m1, Method* m2,
                                                     KlassDepChange* changes = NULL);
    static Klass* check_has_no_finalizable_subclasses(Klass* ctxk, KlassDepChange* changes = NULL);
!   static Klass* check_call_site_target_value(Klass* recorded_ctxk, oop call_site, oop method_handle, CallSiteDepChange* changes = NULL);
    // A returned Klass* is NULL if the dependency assertion is still
    // valid.  A non-NULL Klass* is a 'witness' to the assertion
    // failure, a point in the class hierarchy where the assertion has
    // been proven false.  For example, if check_leaf_type returns
    // non-NULL, the value is a subtype of the supposed leaf type.  This
--- 328,338 ----
    static Klass* check_abstract_with_exclusive_concrete_subtypes(Klass* ctxk, Klass* k1, Klass* k2,
                                                                    KlassDepChange* changes = NULL);
    static Klass* check_exclusive_concrete_methods(Klass* ctxk, Method* m1, Method* m2,
                                                     KlassDepChange* changes = NULL);
    static Klass* check_has_no_finalizable_subclasses(Klass* ctxk, KlassDepChange* changes = NULL);
!   static Klass* check_call_site_target_value(oop call_site, oop method_handle, CallSiteDepChange* changes = NULL);
    // A returned Klass* is NULL if the dependency assertion is still
    // valid.  A non-NULL Klass* is a 'witness' to the assertion
    // failure, a point in the class hierarchy where the assertion has
    // been proven false.  For example, if check_leaf_type returns
    // non-NULL, the value is a subtype of the supposed leaf type.  This
*** 494,504 ****
      }
  
      bool next();
  
      DepType type()               { return _type; }
!     bool is_oop_argument(int i)  { return type() == call_site_target_value && i > 0; }
      uintptr_t get_identifier(int i);
  
      int argument_count()         { return dep_args(type()); }
      int argument_index(int i)    { assert(0 <= i && i < argument_count(), "oob");
                                     return _xi[i]; }
--- 494,504 ----
      }
  
      bool next();
  
      DepType type()               { return _type; }
!     bool is_oop_argument(int i)  { return type() == call_site_target_value; }
      uintptr_t get_identifier(int i);
  
      int argument_count()         { return dep_args(type()); }
      int argument_index(int i)    { assert(0 <= i && i < argument_count(), "oob");
                                     return _xi[i]; }