*** old/src/share/vm/memory/metaspace.cpp	Thu Mar 10 21:50:11 2016
--- new/src/share/vm/memory/metaspace.cpp	Thu Mar 10 21:50:11 2016

*** 2143,2152 ****
--- 2143,2153 ----
      cur->container()->dec_container_count();
      // Capture the next link before it is changed
      // by the call to return_chunk_at_head();
      Metachunk* next = cur->next();
      DEBUG_ONLY(cur->set_is_tagged_free(true);)
+     NOT_PRODUCT(cur->zap();)
      list->return_chunk_at_head(cur);
      cur = next;
    }
  }
  

*** 2207,2216 ****
--- 2208,2218 ----
  
    while (humongous_chunks != NULL) {
  #ifdef ASSERT
      humongous_chunks->set_is_tagged_free(true);
  #endif
+     NOT_PRODUCT(humongous_chunks->zap();)
      log.trace(PTR_FORMAT " (" SIZE_FORMAT ") ", p2i(humongous_chunks), humongous_chunks->word_size());
      assert(humongous_chunks->word_size() == (size_t)
             align_size_up(humongous_chunks->word_size(),
                               smallest_chunk_size()),
             "Humongous chunk size is wrong: word size " SIZE_FORMAT