< prev index next >

src/share/vm/memory/metaspace.cpp

Print this page

        

@@ -3472,11 +3472,11 @@
     if (PrintSharedSpaces) {
       space->record_allocation(result, type, space->vsm()->get_raw_word_size(word_size));
     }
 
     // Zero initialize.
-    Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+    Copy::fill_to_words((HeapWord*)result, word_size, 0);
 
     return result;
   }
 
   MetadataType mdtype = (type == MetaspaceObj::ClassType) ? ClassType : NonClassType;

@@ -3511,11 +3511,11 @@
       report_metadata_oome(loader_data, word_size, type, mdtype, CHECK_NULL);
     }
   }
 
   // Zero initialize.
-  Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+  Copy::fill_to_words((HeapWord*)result, word_size, 0);
 
   return result;
 }
 
 size_t Metaspace::class_chunk_size(size_t word_size) {

@@ -3581,11 +3581,11 @@
 }
 
 void Metaspace::record_allocation(void* ptr, MetaspaceObj::Type type, size_t word_size) {
   assert(DumpSharedSpaces, "sanity");
 
-  int byte_size = (int)word_size * HeapWordSize;
+  int byte_size = (int)word_size * wordSize;
   AllocRecord *rec = new AllocRecord((address)ptr, type, byte_size);
 
   if (_alloc_record_head == NULL) {
     _alloc_record_head = _alloc_record_tail = rec;
   } else if (_alloc_record_tail->_ptr + _alloc_record_tail->_byte_size == (address)ptr) {

@@ -3621,11 +3621,11 @@
 void Metaspace::record_deallocation(void* ptr, size_t word_size) {
   assert(DumpSharedSpaces, "sanity");
 
   for (AllocRecord *rec = _alloc_record_head; rec; rec = rec->_next) {
     if (rec->_ptr == ptr) {
-      assert(rec->_byte_size == (int)word_size * HeapWordSize, "sanity");
+      assert(rec->_byte_size == (int)word_size * wordSize, "sanity");
       rec->_type = MetaspaceObj::DeallocatedType;
       return;
     }
   }
 
< prev index next >