hotspot/src/share/vm/oops/oopsHierarchy.hpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)oopsHierarchy.hpp    1.31 07/05/17 15:57:10 JVM"
  #endif
  /*
!  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)oopsHierarchy.hpp    1.31 07/05/17 15:57:10 JVM"
  #endif
  /*
!  * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 27,48 ****
  
  // OBJECT hierarchy
  // This hierarchy is a representation hierarchy, i.e. if A is a superclass
  // of B, A's representation is a prefix of B's representation.
  
  #ifndef CHECK_UNHANDLED_OOPS
  
  typedef class oopDesc*                      oop;
  typedef class   instanceOopDesc*            instanceOop;
  typedef class   methodOopDesc*              methodOop;
  typedef class   constMethodOopDesc*         constMethodOop;
  typedef class   methodDataOopDesc*          methodDataOop;
  typedef class   arrayOopDesc*               arrayOop;
- typedef class     constantPoolOopDesc*      constantPoolOop;
- typedef class     constantPoolCacheOopDesc* constantPoolCacheOop;
  typedef class     objArrayOopDesc*          objArrayOop;
  typedef class     typeArrayOopDesc*         typeArrayOop;
  typedef class   symbolOopDesc*              symbolOop;
  typedef class   klassOopDesc*               klassOop;
  typedef class   markOopDesc*                markOop;
  typedef class   compiledICHolderOopDesc*    compiledICHolderOop;
  
--- 27,52 ----
  
  // OBJECT hierarchy
  // This hierarchy is a representation hierarchy, i.e. if A is a superclass
  // of B, A's representation is a prefix of B's representation.
  
+ typedef juint narrowOop; // Offset instead of address for an oop within a java object
+ typedef class klassOopDesc* wideKlassOop; // to keep SA happy and unhandled oop
+                                           // detector happy.
+ 
  #ifndef CHECK_UNHANDLED_OOPS
  
  typedef class oopDesc*                            oop;
  typedef class   instanceOopDesc*            instanceOop;
  typedef class   methodOopDesc*                    methodOop;
  typedef class   constMethodOopDesc*            constMethodOop;
  typedef class   methodDataOopDesc*            methodDataOop;
  typedef class   arrayOopDesc*                    arrayOop;
  typedef class     objArrayOopDesc*            objArrayOop;
  typedef class     typeArrayOopDesc*            typeArrayOop;
+ typedef class   constantPoolOopDesc*            constantPoolOop;
+ typedef class   constantPoolCacheOopDesc*   constantPoolCacheOop;
  typedef class   symbolOopDesc*                    symbolOop;
  typedef class   klassOopDesc*                    klassOop;
  typedef class   markOopDesc*                    markOop;
  typedef class   compiledICHolderOopDesc*    compiledICHolderOop;
  
*** 173,183 ****
  class     instanceKlassKlass;
  class     arrayKlassKlass;
  class       objArrayKlassKlass;
  class       typeArrayKlassKlass;
  class   arrayKlass;
- class     constantPoolKlass;
- class     constantPoolCacheKlass;
  class     objArrayKlass;
  class     typeArrayKlass;
  class       symbolKlass;
  class   compiledICHolderKlass;
--- 177,187 ----
  class     instanceKlassKlass;
  class     arrayKlassKlass;
  class       objArrayKlassKlass;
  class       typeArrayKlassKlass;
  class   arrayKlass;
  class     objArrayKlass;
  class     typeArrayKlass;
+ class   constantPoolKlass;
+ class   constantPoolCacheKlass;
  class   symbolKlass;
  class   compiledICHolderKlass;