7200615: NPG: optimized VM build is broken

Reviewed-by: kvn

src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp

@@ -129,7 +129,7 @@ void WorkerDataArray<T>::print(int level, const char* title) {
   buf.append_and_print_cr("]");
 }
 
-#ifdef ASSERT
+#ifndef PRODUCT
 
 template <class T>
 void WorkerDataArray<T>::reset() {

src/share/vm/memory/metaspace.cpp

@@ -2518,7 +2518,7 @@ void SpaceManager::dump(outputStream* const out) const {
                 " waste " SIZE_FORMAT, curr_total, used, free, capacity, waste);
 }
 
-#ifndef PRODUCT
+#ifdef ASSERT
 void SpaceManager::mangle_freed_chunks() {
   for (ChunkIndex index = SmallIndex;
        index < NumberOfFreeLists;
@@ -2536,7 +2536,7 @@ void SpaceManager::mangle_freed_chunks() {
     }
   }
 }
-#endif // PRODUCT
+#endif // ASSERT
 
 
 // MetaspaceAux