*** old/test/testlibrary/whitebox/sun/hotspot/code/BlobType.java	Thu Dec  4 21:15:00 2014
--- new/test/testlibrary/whitebox/sun/hotspot/code/BlobType.java	Thu Dec  4 21:15:00 2014

*** 30,59 ****
--- 30,61 ----
  
  import sun.hotspot.WhiteBox;
  
  public enum BlobType {
      // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods)
!     MethodNonProfiled(0, "CodeHeap 'non-profiled nmethods'", "NonProfiledCodeHeapSize"),
      // Execution level 2 and 3 (profiled) nmethods
!     MethodProfiled(1, "CodeHeap 'profiled nmethods'", "ProfiledCodeHeapSize"),
      // Non-nmethods like Buffers, Adapters and Runtime Stubs
!     NonNMethod(2, "CodeHeap 'non-nmethods'", "NonNMethodCodeHeapSize") {
          @Override
          public boolean allowTypeWhenOverflow(BlobType type) {
              return super.allowTypeWhenOverflow(type)
                      || type == BlobType.MethodNonProfiled;
          }
      },
      // All types (No code cache segmentation)
!     All(3, "CodeCache", "ReservedCodeCacheSize");
  
      public final int id;
!     private final String beanName;
!     public final String sizeOptionName;
+     public final String beanName;
  
!     private BlobType(int id, String beanName, String sizeOptionName) {
          this.id = id;
          this.beanName = beanName;
+         this.sizeOptionName = sizeOptionName;
      }
  
      public MemoryPoolMXBean getMemoryPool() {
          for (MemoryPoolMXBean bean : ManagementFactory.getMemoryPoolMXBeans()) {
              String name = bean.getName();

*** 85,90 ****
--- 87,96 ----
              // there is no MethodProfiled in non tiered world or pure C1
              result.remove(MethodProfiled);
          }
          return result;
      }
+     
+     public long getSize() {
+         return WhiteBox.getWhiteBox().getUintxVMFlag(sizeOptionName);
+     }
  }