Bug#991865: unblock: openjdk-11-jre-dcevm/11.0.12+7-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package openjdk-11-jre-dcevm
openjdk-11-jre-dcevm is a patched OpenJDK VM with extra debugging features
for developers, it's tighly tied to the openjdk-11 package and often has
to follow the major updates. The openjdk-11/11.0.12+7-2 upload last week
broke openjdk-11-jre-dcevm (#991006), this was fixed with the upload of
openjdk-11-jre-dcevm/11.0.12+7-1 for which I'd like to request an unblock.
Besides rebasing on top of OpenJDK 11.0.12+7, the DCEVM update has no other
changes compared to the previous version 11.0.11+9. I'm adding below the diff
between the DCEVM changes for OpenJDK 11.0.11 and 11.0.12, only the hunk headers
changed, not the content.
Thank you,
Emmanuel Bourg
$ diff dcevm-11.0.11+9.patch dcevm-11.0.12+7.patch
1,8d0
< diff --git a/AdoptOpenJDK.md b/AdoptOpenJDK.md
< new file mode 100644
< index 0000000000..88a0a38ee8
< --- /dev/null
< +++ b/AdoptOpenJDK.md
< @@ -0,0 +1,2 @@
< +AdoptOpenJDK marker file
< +
93c85
< index b9440902d3..111610cb25 100644
---
> index 12a95c5948..ab880836ec 100644
123c115
< index bc2561fb09..9a2d66bdd5 100644
---
> index 211c2acda2..88ccb82937 100644
126c118
< @@ -3784,6 +3784,10 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, bool ign
---
> @@ -3783,6 +3783,10 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, bool ign
282c274
< index 6d65cca210..7158fdb77d 100644
---
> index 154dab55e4..59dcd44724 100644
413c405
< index f0cf1fb7cb..5713bb9e98 100644
---
> index 03954f5215..c2c8348f74 100644
416c408
< @@ -1501,6 +1501,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
---
> @@ -1498,6 +1498,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
425c417
< index c58026ae19..f319cca3b2 100644
---
> index 21f8b67d13..e451f5407c 100644
697c689
< index 3ac1ca69ae..6c072407fd 100644
---
> index b949bac8de..a1baaef86f 100644
1223c1215
< index bfd67334f8..3368b74217 100644
---
> index 4509025cf7..1ef4ffc0a2 100644
1346c1338
< @@ -1372,6 +1395,10 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
---
> @@ -1374,6 +1397,10 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
1357c1349
< @@ -1553,11 +1580,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
---
> @@ -1555,11 +1582,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
1371c1363
< @@ -1582,7 +1610,13 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
---
> @@ -1584,7 +1612,13 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
1386c1378
< @@ -1616,7 +1650,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
---
> @@ -1618,7 +1652,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
1395c1387
< @@ -1694,7 +1728,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
---
> @@ -1696,7 +1730,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
1404c1396
< @@ -1817,6 +1851,19 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
---
> @@ -1819,6 +1853,19 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
1424c1416
< @@ -1941,6 +1988,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
---
> @@ -1943,6 +1990,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
1441c1433
< @@ -2113,7 +2170,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
---
> @@ -2115,7 +2172,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
1451c1443
< index 649b321a6a..4220978a02 100644
---
> index a14728df75..aba2780a32 100644
1463c1455
< @@ -302,6 +304,7 @@ public:
---
> @@ -305,6 +307,7 @@ public:
1471c1463
< @@ -310,6 +313,7 @@ public:
---
> @@ -313,6 +316,7 @@ public:
1479c1471
< @@ -318,6 +322,7 @@ public:
---
> @@ -321,6 +325,7 @@ public:
1487c1479
< @@ -462,6 +467,12 @@ public:
---
> @@ -465,6 +470,12 @@ public:
1500c1492
< @@ -655,7 +666,7 @@ protected:
---
> @@ -658,7 +669,7 @@ protected:
1548c1540
< index 8955dd0b36..daaa8d1237 100644
---
> index cef3f530cb..3477a408cb 100644
1551c1543
< @@ -286,6 +286,8 @@
---
> @@ -287,6 +287,8 @@
1560c1552
< @@ -340,6 +342,7 @@
---
> @@ -341,6 +343,7 @@
1568c1560
< @@ -352,6 +355,8 @@
---
> @@ -353,6 +356,8 @@
1577c1569
< @@ -446,6 +451,12 @@
---
> @@ -447,6 +452,12 @@
1604c1596
< index 7838d24677..26d6cd1bc6 100644
---
> index 65eb05efd4..6b7d2aad07 100644
1626c1618
< @@ -55,6 +61,7 @@ void CompiledMethod::init_defaults() {
---
> @@ -62,6 +68,7 @@ void CompiledMethod::init_defaults() {
1635c1627
< index 1dd185dc53..935c295485 100644
---
> index 75ca840bea..725895bdda 100644
1659c1651
< index 60aa462604..bc39e147f2 100644
---
> index 9a689ef3db..dd42c6569c 100644
1916c1908
< index a15b400c8e..985fbad581 100644
---
> index 83b7d6b507..c4ae1eee35 100644
1919c1911
< @@ -2111,6 +2111,21 @@ public:
---
> @@ -2115,6 +2115,21 @@ public:
1941c1933
< @@ -2124,6 +2139,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
---
> @@ -2128,6 +2143,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
3938c3930
< index 916772c0b1..6c7edaca67 100644
---
> index 576da96ed3..2596ed7add 100644
3951c3943
< @@ -1402,6 +1403,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
---
> @@ -1447,6 +1448,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
3960c3952
< @@ -1742,14 +1745,14 @@ bool CompressedLineNumberReadStream::read_pair() {
---
> @@ -1787,14 +1790,14 @@ bool CompressedLineNumberReadStream::read_pair() {
3977c3969
< @@ -1895,7 +1898,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
---
> @@ -1940,7 +1943,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
3986c3978
< @@ -1904,7 +1907,7 @@ void BreakpointInfo::set(Method* method) {
---
> @@ -1949,7 +1952,7 @@ void BreakpointInfo::set(Method* method) {
3995c3987
< @@ -2096,6 +2099,10 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
---
> @@ -2141,6 +2144,10 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
4007c3999
< index 18c706187d..193e1845b2 100644
---
> index da8468dead..9ff4f0e803 100644
4063c4055
< index f97965ee88..dcd9ae8462 100644
---
> index e9f4009fd2..ebdc524375 100644
6615c6607
< index cd77076752..93339b3584 100644
---
> index 589d7f6f6d..50c9b3fdd1 100644
6618c6610
< @@ -2776,7 +2776,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
---
> @@ -2779,7 +2779,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
6690c6682
< index c071e0641d..e6b48dc36f 100644
---
> index 5c1ed782b8..0368bef26e 100644
6693c6685
< @@ -197,10 +197,10 @@ void ResolvedMethodTable::print() {
---
> @@ -198,10 +198,10 @@ void ResolvedMethodTable::print() {
6706c6698
< @@ -240,4 +240,69 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
---
> @@ -241,4 +241,69 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
7043c7035
< index 4a53ecb37a..b8f6481535 100644
---
> index 5c38950541..24a7e66f1f 100644
7059c7051
< @@ -2674,7 +2680,33 @@ define_pd_global(uint64_t,MaxRAM, 1ULL*G);
---
> @@ -2680,7 +2686,33 @@ define_pd_global(uint64_t,MaxRAM, 1ULL*G);
7124c7116
< index d504ef00f9..982ba1b69d 100644
---
> index 9533b46e6b..ef0bb2fe64 100644
Reply to: