archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8049420: Backout 8048248 to correct attribution

Browse source 
Reviewed-by: ehelin, brutisso
This commit is contained in:
Stefan Karlsson 2014-07-07 12:37:11 +02:00
parent 8c3aced316
commit ef1e9b3c80
75 changed files with 911 additions and 2206 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hotspot/src/share/vm/utilities/array.hpp
View file

@ -305,7 +305,6 @@ class Array: public MetaspaceObj {
friend class MetadataFactory;
friend class VMStructs;
friend class MethodHandleCompiler; // special case
friend class WhiteBox;
protected:
int _length; // the number of array elements
T _data[1]; // the array memory
@ -327,29 +326,6 @@ protected:
static size_t byte_sizeof(int length) { return sizeof(Array<T>) + MAX2(length - 1, 0) * sizeof(T); }
// WhiteBox API helper.
static int bytes_to_length(size_t bytes) {
assert(is_size_aligned(bytes, BytesPerWord), "Must be, for now");
if (sizeof(Array<T>) >= bytes) {
return 0;
}
size_t left = bytes - sizeof(Array<T>);
assert(is_size_aligned(left, sizeof(T)), "Must be");
size_t elements = left / sizeof(T);
assert(elements <= (size_t)INT_MAX, err_msg("number of elements " SIZE_FORMAT "doesn't fit into an int.", elements));
int length = (int)elements;
assert((size_t)size(length) * BytesPerWord == bytes,
err_msg("Expected: " SIZE_FORMAT " got: " SIZE_FORMAT,
bytes, (size_t)size(length) * BytesPerWord));
return length;
}
explicit Array(int length) : _length(length) {
assert(length >= 0, "illegal length");
}