src/os/solaris/dtrace/generateJvmOffsets.cpp

*** 80,104 ****
  StubQueue* AbstractInterpreter::_code = NULL;
  
  #endif /* ASSERT */
  #endif /* COMPILER1 */
  
! #define GEN_OFFS(Type,Name)                             \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
      printf("#define OFFSET_%-33s %d\n",                 \
!             #Type #Name, offset_of(Type, Name));        \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_OFFSET_%-33s %d\n",             \
!             #Type #Name, index++);                      \
      break;                                              \
    case GEN_TABLE:                                       \
!     printf("\tOFFSET_%s,\n", #Type #Name);              \
      break;                                              \
    }
  
  #define GEN_SIZE(Type)                                  \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
      printf("#define SIZE_%-35s %d\n",                   \
              #Type, sizeof(Type));                       \
--- 80,107 ----
  StubQueue* AbstractInterpreter::_code = NULL;
  
  #endif /* ASSERT */
  #endif /* COMPILER1 */
  
! #define GEN_OFFS_NAME(Type,Name,OutputType)             \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
      printf("#define OFFSET_%-33s %d\n",                 \
!             #OutputType #Name, offset_of(Type, Name));  \
      break;                                              \
    case GEN_INDEX:                                       \
      printf("#define IDX_OFFSET_%-33s %d\n",             \
!             #OutputType #Name, index++);                \
      break;                                              \
    case GEN_TABLE:                                       \
!     printf("\tOFFSET_%s,\n", #OutputType #Name);        \
      break;                                              \
    }
  
+ #define GEN_OFFS(Type,Name)                             \
+   GEN_OFFS_NAME(Type,Name,Type)
+ 
  #define GEN_SIZE(Type)                                  \
    switch(gen_variant) {                                 \
    case GEN_OFFSET:                                      \
      printf("#define SIZE_%-35s %d\n",                   \
              #Type, sizeof(Type));                       \
*** 239,248 ****
--- 242,256 ----
    GEN_OFFS(VirtualSpace, _high_boundary);
    GEN_OFFS(VirtualSpace, _low);
    GEN_OFFS(VirtualSpace, _high);
    printf("\n");
  
+   /* We need to use different names here because of the template parameter */
+   GEN_OFFS_NAME(GrowableArray<CodeHeap*>, _data, GrowableArray_CodeHeap);
+   GEN_OFFS_NAME(GrowableArray<CodeHeap*>, _len, GrowableArray_CodeHeap);
+   printf("\n");
+ 
    GEN_OFFS(CodeBlob, _name);
    GEN_OFFS(CodeBlob, _header_size);
    GEN_OFFS(CodeBlob, _content_offset);
    GEN_OFFS(CodeBlob, _code_offset);
    GEN_OFFS(CodeBlob, _data_offset);