# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1620613188 -3600
# Node ID f1e14ec217837c5cb972a2c13e790d602490a73c
# Parent  1c52437839ebf2575c55fa27f2a9702ae05e6ffd
PR3837: Include C2 backports to fix null pointer issue with GCC 11.

Upstream changes:
  - JDK-8250825, PR3837: C2 crashes with assert(field != __null) failed: missing field
  - JDK-8255466, PR3837: C2 crashes at ciObject::get_oop() const+0x0

ChangeLog:

2021-05-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3837: Include C2 backports to fix null pointer
	issue with GCC 11.
	* NEWS: Updated.
	* hotspot.map.in: Bumped to include PR3837
	fixes.

diff -r 1c52437839eb -r f1e14ec21783 ChangeLog
--- a/ChangeLog	Fri May 07 06:50:16 2021 +0100
+++ b/ChangeLog	Mon May 10 03:19:48 2021 +0100
@@ -1,3 +1,11 @@
+2021-05-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3837: Include C2 backports to fix null pointer
+	issue with GCC 11.
+	* NEWS: Updated.
+	* hotspot.map.in: Bumped to include PR3837
+	fixes.
+
 2021-05-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3836: Extra compiler flags not passed to
diff -r 1c52437839eb -r f1e14ec21783 NEWS
--- a/NEWS	Fri May 07 06:50:16 2021 +0100
+++ b/NEWS	Mon May 10 03:19:48 2021 +0100
@@ -135,6 +135,9 @@
   - JDK-8258247: Couple of issues in fix for JDK-8249906
   - JDK-8259428: AlgorithmId.getEncodedParams() should return copy
   - JDK-8261183: Follow on to Make lists of normal filenames
+* Backports
+  - JDK-8250825, PR3837: C2 crashes with assert(field != __null) failed: missing field
+  - JDK-8255466, PR3837: C2 crashes at ciObject::get_oop() const+0x0
 * Bug fixes
   - PR3822: Update elliptic curve patch to handle jdk.disabled.namedCurves (JDK-8233228) & file movement (JDK-8035166)
   - PR3836: Extra compiler flags not passed to adlc build
diff -r 1c52437839eb -r f1e14ec21783 hotspot.map.in
--- a/hotspot.map.in	Fri May 07 06:50:16 2021 +0100
+++ b/hotspot.map.in	Mon May 10 03:19:48 2021 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 39b62f35eca8 fcd348bd55a6321364d4a8a9906829d51b716810c1ffba315e9b06b7a7d7e866
+default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 48303d08a880 9cc3e069e0428eae522dad0eb3f245e0ecaf112a6f520e040c250011b0ebe7ee
 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 9e58eb00ef60 d81606795abe5721d54aef6413677845a24c5b2202414a095bd04f1fba945fca
 aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ fa977f20ebe0 f852d17ae09047f2432604422e9e58ec6473eceabe8b217320928e3ee2e58d4c