*** old/src/share/vm/memory/metaspace.cpp	Thu Jan 31 09:07:39 2013
--- new/src/share/vm/memory/metaspace.cpp	Thu Jan 31 09:07:39 2013

*** 1735,1748 ****
--- 1735,1748 ----
    default:
      *chunk_word_size = SmallChunk;
      *class_chunk_word_size = ClassSmallChunk;
      break;
    }
!   assert(*chunk_word_size != 0 && *class_chunk_word_size != 0,
      err_msg("Initial chunks sizes bad: data  " SIZE_FORMAT
              " class " SIZE_FORMAT,
!             *chunk_word_size, *class_chunk_word_size));
  }
  
  size_t SpaceManager::sum_free_in_chunks_in_use() const {
    MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
    size_t free = 0;

*** 2038,2048 ****
--- 2038,2048 ----
      }
      assert(humongous_chunks->word_size() == (size_t)
             align_size_up(humongous_chunks->word_size(),
                               HumongousChunkGranularity),
             err_msg("Humongous chunk size is wrong: word size " SIZE_FORMAT
!                    " granularity " SIZE_FORMAT,
!                    " granularity %d",
                     humongous_chunks->word_size(), HumongousChunkGranularity));
      Metachunk* next_humongous_chunks = humongous_chunks->next();
      chunk_manager->humongous_dictionary()->return_chunk(humongous_chunks);
      humongous_chunks = next_humongous_chunks;
    }

*** 2262,2272 ****
--- 2262,2273 ----
                             allocation_total(),
                             sum_used_in_chunks_in_use());
    }
    MutexLockerEx cl(lock(), Mutex::_no_safepoint_check_flag);
    assert(allocation_total() == sum_used_in_chunks_in_use(),
!     err_msg("allocation total is not consistent %d vs %d",
!     err_msg("allocation total is not consistent " SIZE_FORMAT
+             " vs " SIZE_FORMAT,
              allocation_total(), sum_used_in_chunks_in_use()));
  }
  
  #endif
  

*** 2576,2586 ****
--- 2577,2588 ----
  // For UseCompressedKlassPointers the class space is reserved as a piece of the
  // Java heap because the compression algorithm is the same for each.  The
  // argument passed in is at the top of the compressed space
  void Metaspace::initialize_class_space(ReservedSpace rs) {
    // The reserved space size may be bigger because of alignment, esp with UseLargePages
-   assert(rs.size() >= ClassMetaspaceSize, err_msg("%d != %d", rs.size(), ClassMetaspaceSize));
+          err_msg(SIZE_FORMAT " != " UINTX_FORMAT, rs.size(), ClassMetaspaceSize));
    _class_space_list = new VirtualSpaceList(rs);
  }
  
  void Metaspace::initialize(Mutex* lock,
                             MetaspaceType type) {