[gcc(refs/vendors/ARM/heads/morello)] varasm: Don't call assemble_integer on NULLPTR_TYPE cst

[gcc(refs/vendors/ARM/heads/morello)] varasm: Don't call assemble_integer on NULLPTR_TYPE cst

[Alex Coplan]

https://gcc.gnu.org/g:b77e97c4392cc7b10dc598245c3e9eedbed6e4c6

commit b77e97c4392cc7b10dc598245c3e9eedbed6e4c6
Author: Alex Coplan <alex.coplan@arm.com>
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;