From bd25a9e6eae93db2b91b9518d8cbb1c8f76e9862 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 29 May 2023 21:07:56 +0000
Subject: [PATCH] Bug 1835676 - Update gcc11 to version 11.4. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D179374
---
 build/unix/build-gcc/PR104142.patch | 54 -----------------------------
 taskcluster/ci/fetch/toolchains.yml | 12 +++----
 taskcluster/ci/toolchain/gcc.yml    |  6 +---
 3 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 build/unix/build-gcc/PR104142.patch

diff --git a/build/unix/build-gcc/PR104142.patch b/build/unix/build-gcc/PR104142.patch
deleted file mode 100644
index d619510315db..000000000000
--- a/build/unix/build-gcc/PR104142.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8ce475543d784f8ce0f7e80f7faff39fa8eb92da Mon Sep 17 00:00:00 2001
-From: Jason Merrill <jason@redhat.com>
-Date: Mon, 11 Apr 2022 14:50:14 -0400
-Subject: [PATCH] c++: rodata and defaulted ctor [PR104142]
-
-Trivial initialization shouldn't bump a variable out of .rodata; if the
-result of build_aggr_init is an empty STATEMENT_LIST, throw it away.
-
-	PR c++/104142
-
-gcc/cp/ChangeLog:
-
-	* decl.cc (check_initializer): Check TREE_SIDE_EFFECTS.
-
-gcc/testsuite/ChangeLog:
-
-	* g++.dg/opt/const7.C: New test.
----
- gcc/cp/decl.c                     | 4 ++++
- gcc/testsuite/g++.dg/opt/const7.C | 7 +++++++
- 2 files changed, 11 insertions(+)
- create mode 100644 gcc/testsuite/g++.dg/opt/const7.C
-
-diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
-index bffbd004167..7b0872cd55e 100644
---- a/gcc/cp/decl.c
-+++ b/gcc/cp/decl.c
-@@ -7227,6 +7227,10 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **cleanups)
-   if (init && init != error_mark_node)
-     init_code = build2 (INIT_EXPR, type, decl, init);
- 
-+  if (init_code && !TREE_SIDE_EFFECTS (init_code)
-+      && init_code != error_mark_node)
-+    init_code = NULL_TREE;
-+
-   if (init_code)
-     {
-       /* We might have set these in cp_finish_decl.  */
-diff --git a/gcc/testsuite/g++.dg/opt/const7.C b/gcc/testsuite/g++.dg/opt/const7.C
-new file mode 100644
-index 00000000000..5bcf94897a8
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/opt/const7.C
-@@ -0,0 +1,7 @@
-+// PR c++/104142
-+// { dg-do compile { target c++11 } }
-+// { dg-additional-options -Wunused-variable }
-+
-+struct B { B()=default; };
-+static const B b_var;		//  { dg-bogus "" }
-+// { dg-final { scan-assembler-symbol-section {b_var} {^\.(const|rodata)|\[RO\]} } }
--- 
-2.36.0.1.g2bbe56bd8d
-
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index b46f35db3475..969ac1e8c5d6 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -72,16 +72,16 @@ gcc-9.4.0:
         strip-components: 1
         add-prefix: gcc-source/
 
-gcc-11.3.0:
-    description: GCC 11.3.0 source code
+gcc-11.4.0:
+    description: GCC 11.4.0 source code
     fetch:
         type: static-url
-        url: ftp://ftp.gnu.org/gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz
-        sha256: b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39
-        size: 81141364
+        url: https://ftp.gnu.org/gnu/gcc/gcc-11.4.0/gcc-11.4.0.tar.xz
+        sha256: 3f2db222b007e8a4a23cd5ba56726ef08e8b1f1eb2055ee72c1402cea73a8dd9
+        size: 79837032
         gpg-signature:
             sig-url: "{url}.sig"
-            key-path: build/unix/build-gcc/7F74F97C103468EE5D750B583AB00996FC26A641.key
+            key-path: build/unix/build-gcc/D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62.key
         artifact-name: gcc-source.tar.zst
         strip-components: 1
         add-prefix: gcc-source/
diff --git a/taskcluster/ci/toolchain/gcc.yml b/taskcluster/ci/toolchain/gcc.yml
index 1bdebb51ea00..23197d3ac6a9 100644
--- a/taskcluster/ci/toolchain/gcc.yml
+++ b/taskcluster/ci/toolchain/gcc.yml
@@ -63,13 +63,9 @@ linux64-gcc-11:
         symbol: TL(gcc11)
     run:
         script: build-gcc-linux.sh
-        arguments:
-            - build/unix/build-gcc/PR104142.patch
-        resources:
-            - build/unix/build-gcc/PR104142.patch
     fetches:
         fetch:
-            - gcc-11.3.0
+            - gcc-11.4.0
             - gmp-6.1.0
             - isl-0.16.1
             - mpc-1.0.3