Skip to content

Commit e2e1efe

Browse files
authored
Merge pull request #76 from JakubVanek/bugfix/jdk13
[patch] fix: rebase jdk13 patches
2 parents 24a68ed + 81e1c04 commit e2e1efe

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

scripts/jdk13_jfr.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
2-
index 02941d167..5823ca71c 100644
2+
index 84053c343..68388215e 100644
33
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
44
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
55
@@ -84,17 +84,17 @@ size_t JfrChunkWriter::close(int64_t metadata_offset) {
@@ -9,8 +9,8 @@ index 02941d167..5823ca71c 100644
99
- this->write_be_at_offset(size_written(), CHUNK_SIZE_OFFSET);
1010
+ this->write_be_at_offset((u8)size_written(), CHUNK_SIZE_OFFSET);
1111
// initial checkpoint event offset
12-
- this->write_be_at_offset(_chunkstate->previous_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE));
13-
+ this->write_be_at_offset((u8)_chunkstate->previous_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE));
12+
- this->write_be_at_offset(_chunkstate->last_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE));
13+
+ this->write_be_at_offset((u8)_chunkstate->last_checkpoint_offset(), CHUNK_SIZE_OFFSET + (1 * FILEHEADER_SLOT_SIZE));
1414
// metadata event offset
1515
- this->write_be_at_offset(metadata_offset, CHUNK_SIZE_OFFSET + (2 * FILEHEADER_SLOT_SIZE));
1616
+ this->write_be_at_offset((u8)metadata_offset, CHUNK_SIZE_OFFSET + (2 * FILEHEADER_SLOT_SIZE));

scripts/jdk13_new.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ index f028781ba..9bd39a865 100644
8585
#include "gc/g1/g1CollectedHeap.hpp"
8686
#endif
8787
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
88-
index 090a422f1..00c382424 100644
88+
index 174f9a668..3bd1e45e7 100644
8989
--- a/src/hotspot/share/oops/constantPool.cpp
9090
+++ b/src/hotspot/share/oops/constantPool.cpp
9191
@@ -414,8 +414,12 @@ void ConstantPool::remove_unshareable_info() {

0 commit comments

Comments
 (0)