--- a/hotspot/src/share/vm/memory/metaspace.cpp Fri Jan 29 20:57:09 2016 -0500
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Sat Jan 30 11:02:29 2016 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -3474,7 +3474,7 @@
}
// Zero initialize.
- Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+ Copy::fill_to_words((HeapWord*)result, word_size, 0);
return result;
}
@@ -3513,7 +3513,7 @@
}
// Zero initialize.
- Copy::fill_to_aligned_words((HeapWord*)result, word_size, 0);
+ Copy::fill_to_words((HeapWord*)result, word_size, 0);
return result;
}
@@ -3583,7 +3583,7 @@
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) {
@@ -3623,7 +3623,7 @@
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;
}