From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7810) id AE266382F091; Fri, 20 May 2022 12:34:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE266382F091 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alex Coplan To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/morello)] varasm: Don't call assemble_integer on NULLPTR_TYPE cst X-Act-Checkin: gcc X-Git-Author: Alex Coplan X-Git-Refname: refs/vendors/ARM/heads/morello X-Git-Oldrev: 68235c7e93261efd4be7f6a0e9a9d005b412880a X-Git-Newrev: b77e97c4392cc7b10dc598245c3e9eedbed6e4c6 Message-Id: <20220520123421.AE266382F091@sourceware.org> Date: Fri, 20 May 2022 12:34:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2022 12:34:21 -0000 https://gcc.gnu.org/g:b77e97c4392cc7b10dc598245c3e9eedbed6e4c6 commit b77e97c4392cc7b10dc598245c3e9eedbed6e4c6 Author: Alex Coplan Date: Fri Mar 18 13:27:06 2022 +0000 varasm: Don't call assemble_integer on NULLPTR_TYPE cst Fixes an ICE seen with gcc/testsuite/g++.dg/cpp0x/nullptr30.C. gcc/ChangeLog: * varasm.c (output_constant): Use assemble_pointer for constants of NULLPTR_TYPE. Diff: --- gcc/varasm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/varasm.c b/gcc/varasm.c index 4ec8ca79205..d680f01690d 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -5219,7 +5219,9 @@ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align, cst = expand_expr (exp, NULL_RTX, VOIDmode, EXPAND_INITIALIZER); if (reverse) cst = flip_storage_order (TYPE_MODE (TREE_TYPE (exp)), cst); - if (!assemble_integer (cst, MIN (size, thissize), align, 0)) + if (code == NULLPTR_TYPE) + assemble_pointer (cst); + else if (!assemble_integer (cst, MIN (size, thissize), align, 0)) error ("initializer for integer/fixed-point value is too complicated"); break;