--- a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp Fri Feb 22 19:58:22 2019 +0530
+++ b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp Fri Feb 22 17:30:07 2019 +0300
@@ -196,7 +196,7 @@
template <typename BE, typename IE, typename WriterPolicyImpl>
inline void WriterHost<BE, IE, WriterPolicyImpl>::write(double value) {
- be_write(*(uintptr_t*)&(value));
+ be_write(*(u8*)&(value));
}
template <typename BE, typename IE, typename WriterPolicyImpl>
@@ -317,9 +317,9 @@
}
template <typename BE, typename IE, typename WriterPolicyImpl>
-inline intptr_t WriterHost<BE, IE, WriterPolicyImpl>::reserve(size_t size) {
+inline int64_t WriterHost<BE, IE, WriterPolicyImpl>::reserve(size_t size) {
if (ensure_size(size) != NULL) {
- intptr_t reserved_offset = this->current_offset();
+ const int64_t reserved_offset = this->current_offset();
this->set_current_pos(size);
return reserved_offset;
}
@@ -329,9 +329,9 @@
template <typename BE, typename IE, typename WriterPolicyImpl>
template <typename T>
-inline void WriterHost<BE, IE, WriterPolicyImpl>::write_padded_at_offset(T value, intptr_t offset) {
+inline void WriterHost<BE, IE, WriterPolicyImpl>::write_padded_at_offset(T value, int64_t offset) {
if (this->is_valid()) {
- const intptr_t current = this->current_offset();
+ const int64_t current = this->current_offset();
this->seek(offset);
write_padded(value);
this->seek(current); // restore
@@ -340,9 +340,9 @@
template <typename BE, typename IE, typename WriterPolicyImpl>
template <typename T>
-inline void WriterHost<BE, IE, WriterPolicyImpl>::write_at_offset(T value, intptr_t offset) {
+inline void WriterHost<BE, IE, WriterPolicyImpl>::write_at_offset(T value, int64_t offset) {
if (this->is_valid()) {
- const intptr_t current = this->current_offset();
+ const int64_t current = this->current_offset();
this->seek(offset);
write(value);
this->seek(current); // restore
@@ -351,9 +351,9 @@
template <typename BE, typename IE, typename WriterPolicyImpl>
template <typename T>
-inline void WriterHost<BE, IE, WriterPolicyImpl>::write_be_at_offset(T value, intptr_t offset) {
+inline void WriterHost<BE, IE, WriterPolicyImpl>::write_be_at_offset(T value, int64_t offset) {
if (this->is_valid()) {
- const intptr_t current = this->current_offset();
+ const int64_t current = this->current_offset();
this->seek(offset);
be_write(value);
this->seek(current); // restore