--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Aug 24 20:38:21 2016 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Aug 24 19:54:03 2016 -0400
@@ -327,11 +327,12 @@
// and then additions like
// ... top() + size ...
// are safe because we know that top() is at least size below end().
-inline size_t pointer_delta(const void* left,
- const void* right,
+inline size_t pointer_delta(const volatile void* left,
+ const volatile void* right,
size_t element_size) {
return (((uintptr_t) left) - ((uintptr_t) right)) / element_size;
}
+
// A version specialized for HeapWord*'s.
inline size_t pointer_delta(const HeapWord* left, const HeapWord* right) {
return pointer_delta(left, right, sizeof(HeapWord));
@@ -516,6 +517,10 @@
return (void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
}
+inline volatile void* align_ptr_down(volatile void* ptr, size_t alignment) {
+ return (volatile void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
+}
+
// Align metaspace objects by rounding up to natural word boundary
inline intptr_t align_metadata_size(intptr_t size) {