Embed real_value into REAL_CST

The following removes the indirection to real_value from REAL_CST
which doesn't seem to serve any useful purpose.  Any sharing can
be achieved by sharing the actual REAL_CST (which is what usually
happens when copying trees) and sharing of real_value amongst
different REAL_CST doesn't happen as far as I can see and would
only lead to further issues like mismatching type and real_value.

2022-04-27  Richard Biener  <rguenther@suse.de>

	* tree-core.h (tree_real_cst::real_cst_ptr): Remove pointer
	to real_value field.
	(tree_real_cst::value): Add real_value field.
	* tree.h (TREE_REAL_CST_PTR): Adjust.
	* tree.cc (build_real): Remove separate allocation.
	* tree-streamer-in.cc (unpack_ts_real_cst_value_fields):
	Likewise.

gcc/cp/
	* module.cc (trees_in::core_vals): Remove separate allocation
	for REAL_CST.
This commit is contained in:
Richard Biener 2022-04-27 13:48:49 +02:00
parent c2a0d2e6f6
commit f1d8a2d9bc
5 changed files with 5 additions and 14 deletions

View File

@ -6468,9 +6468,7 @@ trees_in::core_vals (tree t)
case REAL_CST:
if (const void *bytes = buf (sizeof (real_value)))
TREE_REAL_CST_PTR (t)
= reinterpret_cast<real_value *> (memcpy (ggc_alloc<real_value> (),
bytes, sizeof (real_value)));
memcpy (TREE_REAL_CST_PTR (t), bytes, sizeof (real_value));
break;
case STRING_CST:

View File

@ -1461,7 +1461,7 @@ struct GTY(()) tree_int_cst {
struct GTY(()) tree_real_cst {
struct tree_typed typed;
struct real_value * real_cst_ptr;
struct real_value value;
};
struct GTY(()) tree_fixed_cst {

View File

@ -190,7 +190,6 @@ unpack_ts_real_cst_value_fields (struct bitpack_d *bp, tree expr)
{
unsigned i;
REAL_VALUE_TYPE r;
REAL_VALUE_TYPE *rp;
/* Clear all bits of the real value type so that we can later do
bitwise comparisons to see if two values are the same. */
@ -204,9 +203,7 @@ unpack_ts_real_cst_value_fields (struct bitpack_d *bp, tree expr)
for (i = 0; i < SIGSZ; i++)
r.sig[i] = (unsigned long) bp_unpack_value (bp, HOST_BITS_PER_LONG);
rp = ggc_alloc<real_value> ();
memcpy (rp, &r, sizeof (REAL_VALUE_TYPE));
TREE_REAL_CST_PTR (expr) = rp;
memcpy (TREE_REAL_CST_PTR (expr), &r, sizeof (REAL_VALUE_TYPE));
}

View File

@ -2381,7 +2381,6 @@ tree
build_real (tree type, REAL_VALUE_TYPE d)
{
tree v;
REAL_VALUE_TYPE *dp;
int overflow = 0;
/* dconst{1,2,m1,half} are used in various places in
@ -2408,11 +2407,8 @@ build_real (tree type, REAL_VALUE_TYPE d)
Consider doing it via real_convert now. */
v = make_node (REAL_CST);
dp = ggc_alloc<real_value> ();
memcpy (dp, &d, sizeof (REAL_VALUE_TYPE));
TREE_TYPE (v) = type;
TREE_REAL_CST_PTR (v) = dp;
memcpy (TREE_REAL_CST_PTR (v), &d, sizeof (REAL_VALUE_TYPE));
TREE_OVERFLOW (v) = overflow;
return v;
}

View File

@ -1048,7 +1048,7 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int,
#define POLY_INT_CST_COEFF(NODE, I) \
(POLY_INT_CST_CHECK (NODE)->poly_int_cst.coeffs[I])
#define TREE_REAL_CST_PTR(NODE) (REAL_CST_CHECK (NODE)->real_cst.real_cst_ptr)
#define TREE_REAL_CST_PTR(NODE) (&REAL_CST_CHECK (NODE)->real_cst.value)
#define TREE_REAL_CST(NODE) (*TREE_REAL_CST_PTR (NODE))
#define TREE_FIXED_CST_PTR(NODE) \