src/share/vm/classfile/javaClasses.hpp

rev 7800 : [mq]: cleanupOopInlineHpp

*** 202,214 ****
    // Conversion
    static Symbol* as_symbol(Handle java_string, TRAPS);
    static Symbol* as_symbol_or_null(oop java_string);
  
    // Testers
!   static bool is_instance(oop obj) {
!     return obj != NULL && obj->klass() == SystemDictionary::String_klass();
!   }
  
    // Debugging
    static void print(oop java_string, outputStream* st);
    friend class JavaClasses;
  };
--- 202,213 ----
    // Conversion
    static Symbol* as_symbol(Handle java_string, TRAPS);
    static Symbol* as_symbol_or_null(oop java_string);
  
    // Testers
!   static bool is_instance(oop obj);
!   static bool is_instance_inlined(oop obj);
  
    // Debugging
    static void print(oop java_string, outputStream* st);
    friend class JavaClasses;
  };
*** 271,283 ****
      return result;
    }
    static Symbol* as_signature(oop java_class, bool intern_if_not_found, TRAPS);
    static void print_signature(oop java_class, outputStream *st);
    // Testing
!   static bool is_instance(oop obj) {
!     return obj != NULL && obj->klass() == SystemDictionary::Class_klass();
!   }
    static bool is_primitive(oop java_class);
    static BasicType primitive_type(oop java_class);
    static oop primitive_mirror(BasicType t);
    // JVM_NewArray support
    static Klass* array_klass(oop java_class);
--- 270,281 ----
      return result;
    }
    static Symbol* as_signature(oop java_class, bool intern_if_not_found, TRAPS);
    static void print_signature(oop java_class, outputStream *st);
    // Testing
!   static bool is_instance(oop obj);
! 
    static bool is_primitive(oop java_class);
    static BasicType primitive_type(oop java_class);
    static oop primitive_mirror(BasicType t);
    // JVM_NewArray support
    static Klass* array_klass(oop java_class);
*** 987,999 ****
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::MethodHandle_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    // Accessors for code generation:
    static int type_offset_in_bytes()             { return _type_offset; }
    static int form_offset_in_bytes()             { return _form_offset; }
  };
--- 985,995 ----
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::MethodHandle_klass());
    }
!   static bool is_instance(oop obj);
  
    // Accessors for code generation:
    static int type_offset_in_bytes()             { return _type_offset; }
    static int form_offset_in_bytes()             { return _form_offset; }
  };
*** 1014,1026 ****
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    // Accessors for code generation:
    static int member_offset_in_bytes()           { return _member_offset; }
  };
  
--- 1010,1020 ----
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_klass());
    }
!   static bool is_instance(oop obj);
  
    // Accessors for code generation:
    static int member_offset_in_bytes()           { return _member_offset; }
  };
  
*** 1043,1055 ****
    // Testers
    static bool is_subclass(Klass* klass) {
      return SystemDictionary::LambdaForm_klass() != NULL &&
        klass->is_subclass_of(SystemDictionary::LambdaForm_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    // Accessors for code generation:
    static int vmentry_offset_in_bytes()          { return _vmentry_offset; }
  };
  
--- 1037,1047 ----
    // Testers
    static bool is_subclass(Klass* klass) {
      return SystemDictionary::LambdaForm_klass() != NULL &&
        klass->is_subclass_of(SystemDictionary::LambdaForm_klass());
    }
!   static bool is_instance(oop obj);
  
    // Accessors for code generation:
    static int vmentry_offset_in_bytes()          { return _vmentry_offset; }
  };
  
*** 1109,1121 ****
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::MemberName_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    static bool is_method(oop obj);
  
    // Relevant integer codes (keep these in synch. with MethodHandleNatives.Constants):
    enum {
--- 1101,1111 ----
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::MemberName_klass());
    }
!   static bool is_instance(oop obj);
  
    static bool is_method(oop obj);
  
    // Relevant integer codes (keep these in synch. with MethodHandleNatives.Constants):
    enum {
*** 1164,1176 ****
    static int            rtype_slot_count(oop mt);  // extra counts for long/double
  
    static Symbol*        as_signature(oop mt, bool intern_if_not_found, TRAPS);
    static void           print_signature(oop mt, outputStream* st);
  
!   static bool is_instance(oop obj) {
!     return obj != NULL && obj->klass() == SystemDictionary::MethodType_klass();
!   }
  
    static bool equals(oop mt1, oop mt2);
  
    // Accessors for code generation:
    static int rtype_offset_in_bytes()            { return _rtype_offset; }
--- 1154,1164 ----
    static int            rtype_slot_count(oop mt);  // extra counts for long/double
  
    static Symbol*        as_signature(oop mt, bool intern_if_not_found, TRAPS);
    static void           print_signature(oop mt, outputStream* st);
  
!   static bool is_instance(oop obj);
  
    static bool equals(oop mt1, oop mt2);
  
    // Accessors for code generation:
    static int rtype_offset_in_bytes()            { return _rtype_offset; }
*** 1188,1210 ****
  
    static void compute_offsets();
  
  public:
    // Accessors
!   static oop              target(         oop site)             { return site->obj_field(             _target_offset);         }
!   static void         set_target(         oop site, oop target) {        site->obj_field_put(         _target_offset, target); }
  
!   static volatile oop     target_volatile(oop site)             { return oop((oopDesc *)(site->obj_field_volatile(_target_offset))); }
!   static void         set_target_volatile(oop site, oop target) {        site->obj_field_put_volatile(_target_offset, target); }
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::CallSite_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    // Accessors for code generation:
    static int target_offset_in_bytes()           { return _target_offset; }
  };
  
--- 1176,1196 ----
  
    static void compute_offsets();
  
  public:
    // Accessors
!   static oop              target(         oop site);
!   static void         set_target(         oop site, oop target);
  
!   static volatile oop     target_volatile(oop site);
!   static void         set_target_volatile(oop site, oop target);
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::CallSite_klass());
    }
!   static bool is_instance(oop obj);
  
    // Accessors for code generation:
    static int target_offset_in_bytes()           { return _target_offset; }
  };
  
*** 1266,1278 ****
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::ClassLoader_klass());
    }
!   static bool is_instance(oop obj) {
!     return obj != NULL && is_subclass(obj->klass());
!   }
  
    // Debugging
    friend class JavaClasses;
    friend class ClassFileParser; // access to number_of_fake_fields
  };
--- 1252,1262 ----
  
    // Testers
    static bool is_subclass(Klass* klass) {
      return klass->is_subclass_of(SystemDictionary::ClassLoader_klass());
    }
!   static bool is_instance(oop obj);
  
    // Debugging
    friend class JavaClasses;
    friend class ClassFileParser; // access to number_of_fake_fields
  };