From 95318d469f4d293446b4fd38d527fd5d64ce0b70 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 4 Nov 2021 08:28:44 +0000 Subject: [PATCH] Fix RTL frontend handling of const_vectors The RTL frontend makes sure that CONST_INTs use shared rtxes where appropriate. We should do the same thing for CONST_VECTORs, reusing CONST0_RTX, CONST1_RTX and CONSTM1_RTX. This also has the effect of setting CONST_VECTOR_NELTS_PER_PATTERN and CONST_VECTOR_NPATTERNS. While looking at where to add that, I noticed we had some dead #includes in read-rtl.c. Some of the stuff that read-rtl-function.c does was once in that file instead. gcc/ * read-rtl.c: Remove dead !GENERATOR_FILE block. * read-rtl-function.c (function_reader::consolidate_singletons): Generate canonical CONST_VECTORs. --- gcc/read-rtl-function.c | 3 +++ gcc/read-rtl.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gcc/read-rtl-function.c b/gcc/read-rtl-function.c index 941d1e158a3..5699f574a37 100644 --- a/gcc/read-rtl-function.c +++ b/gcc/read-rtl-function.c @@ -1498,6 +1498,9 @@ function_reader::consolidate_singletons (rtx x) case CONST_INT: return gen_rtx_CONST_INT (GET_MODE (x), INTVAL (x)); + case CONST_VECTOR: + return gen_rtx_CONST_VECTOR (GET_MODE (x), XVEC (x, 0)); + default: break; } diff --git a/gcc/read-rtl.c b/gcc/read-rtl.c index 041166658d1..b33dee06842 100644 --- a/gcc/read-rtl.c +++ b/gcc/read-rtl.c @@ -36,12 +36,6 @@ along with GCC; see the file COPYING3. If not see #include "read-md.h" #include "gensupport.h" -#ifndef GENERATOR_FILE -#include "function.h" -#include "memmodel.h" -#include "emit-rtl.h" -#endif - /* One element in a singly-linked list of (integer, string) pairs. */ struct map_value { struct map_value *next;