tree-optimization/94266 - fix object type extraction heuristics

This fixes the heuristic deriving an actual object type from a
MEM_REFs pointer operand to use the more sensible type of an
actual object instead of the pointed to type.

2020-03-20  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/94266
	* gimple-ssa-sprintf.c (get_origin_and_offset): Use the
	type of the underlying object to adjust for the containing
	field if available.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ded73b3164a1ddf169f9b849266da73276723103..563be357329091b4422834d0a28fcdd9188e5a71 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-20  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/94266
+       * gimple-ssa-sprintf.c (get_origin_and_offset): Use the
+       type of the underlying object to adjust for the containing
+       field if available.
+
 2020-03-20  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
        * config/arm/unspecs.md (UNSPEC_GET_FPSCR): Rename this to ...

diff --git a/gcc/gimple-ssa-sprintf.c b/gcc/gimple-ssa-sprintf.c
index 13640e0fd36b67f8a707f9fa07b2e4b4bd7f8c90..1879686ce0a77eaa167ae4fc8d24b7eacbcb8c15 100644 (file)
--- a/gcc/gimple-ssa-sprintf.c
+++ b/gcc/gimple-ssa-sprintf.c
@@ -2331,7 +2331,9 @@ get_origin_and_offset (tree x, HOST_WIDE_INT *fldoff, HOST_WIDE_INT *off)
 
       if (off)
        {
-         tree xtype = TREE_TYPE (TREE_TYPE (x));
+         tree xtype
+           = (TREE_CODE (x) == ADDR_EXPR
+              ? TREE_TYPE (TREE_OPERAND (x, 0)) : TREE_TYPE (TREE_TYPE (x)));
 
          /* The byte offset of the most basic struct member the byte
             offset *OFF corresponds to, or for a (multidimensional)