From 81e1c04c694c0693731abd9f7fbbe89c01cdcf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= Date: Sat, 28 Nov 2020 14:20:22 +0100 Subject: [PATCH] [patch] fix: rebase jdk13 patches --- scripts/jdk13_jfr.patch | 6 +++--- scripts/jdk13_new.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/jdk13_jfr.patch b/scripts/jdk13_jfr.patch index 90e42d5..fe37d71 100644 --- a/scripts/jdk13_jfr.patch +++ b/scripts/jdk13_jfr.patch @@ -1,5 +1,5 @@ diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp -index 02941d167..5823ca71c 100644 +index 84053c343..68388215e 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp @@ -84,17 +84,17 @@ size_t JfrChunkWriter::close(int64_t metadata_offset) { @@ -9,8 +9,8 @@ index 02941d167..5823ca71c 100644 - this->write_be_at_offset(size_written(), CHUNK_SIZE_OFFSET); + this->write_be_at_offset((u8)size_written(), CHUNK_SIZE_OFFSET); // initial checkpoint event offset -- this->write_be_at_offset(_chunkstate->previous_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE)); -+ this->write_be_at_offset((u8)_chunkstate->previous_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE)); +- this->write_be_at_offset(_chunkstate->last_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE)); ++ this->write_be_at_offset((u8)_chunkstate->last_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE)); // metadata event offset - this->write_be_at_offset(metadata_offset, CHUNK_SIZE_OFFSET + (2 * FILEHEADER_SLOT_SIZE)); + this->write_be_at_offset((u8)metadata_offset, CHUNK_SIZE_OFFSET + (2 * FILEHEADER_SLOT_SIZE)); diff --git a/scripts/jdk13_new.patch b/scripts/jdk13_new.patch index 2738740..a6ab64c 100644 --- a/scripts/jdk13_new.patch +++ b/scripts/jdk13_new.patch @@ -85,7 +85,7 @@ index f028781ba..9bd39a865 100644 #include "gc/g1/g1CollectedHeap.hpp" #endif diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp -index 090a422f1..00c382424 100644 +index 174f9a668..3bd1e45e7 100644 --- a/src/hotspot/share/oops/constantPool.cpp +++ b/src/hotspot/share/oops/constantPool.cpp @@ -414,8 +414,12 @@ void ConstantPool::remove_unshareable_info() {