Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 20220:d15367d92f0d
8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx
Summary: The mismatch in declaration and definition has been encountered when compiling on a platform where the sizes are different. Change the method definition to match the declaration.
Reviewed-by: tschatzl, sjohanss
Contributed-by: Dan Horak <dhorak@redhat.com>
author | tschatzl |
---|---|
date | Mon, 21 Jul 2014 09:40:19 +0200 |
parents | 78bbf4d43a14 |
children | 99dbb9cd9521 |
comparison
equal
deleted
inserted
replaced
20219:f40816c5e359 | 20220:d15367d92f0d |
---|---|
1399 return false; | 1399 return false; |
1400 } | 1400 } |
1401 return true; | 1401 return true; |
1402 } | 1402 } |
1403 | 1403 |
1404 uintx Arguments::max_heap_for_compressed_oops() { | 1404 size_t Arguments::max_heap_for_compressed_oops() { |
1405 // Avoid sign flip. | 1405 // Avoid sign flip. |
1406 assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size"); | 1406 assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size"); |
1407 // We need to fit both the NULL page and the heap into the memory budget, while | 1407 // We need to fit both the NULL page and the heap into the memory budget, while |
1408 // keeping alignment constraints of the heap. To guarantee the latter, as the | 1408 // keeping alignment constraints of the heap. To guarantee the latter, as the |
1409 // NULL page is located before the heap, we pad the NULL page to the conservative | 1409 // NULL page is located before the heap, we pad the NULL page to the conservative |