From c56e3582c20263c442e00da7ea484edf9c912165 Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Wed, 5 Dec 2001 11:33:28 +0000 Subject: [PATCH] emit-rtl.c (component_ref_for_mem_expr): Try harder to find decl underneath COMPONENT_REFs. * emit-rtl.c (component_ref_for_mem_expr): Try harder to find decl underneath COMPONENT_REFs. (set_mem_attributes): Also strip VIEW_CONVERT_EXPR. From-SVN: r47662 --- gcc/ChangeLog | 6 ++++++ gcc/emit-rtl.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b9d1fe97a49..dad21bf5b99 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 5 06:26:27 2001 Richard Kenner + + * emit-rtl.c (component_ref_for_mem_expr): Try harder to find decl + underneath COMPONENT_REFs. + (set_mem_attributes): Also strip VIEW_CONVERT_EXPR. + 2001-12-05 Neil Booth * toplev.c (display_target_options): Don't print twice. diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 6a30769cecb..4238b8c7762 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1649,13 +1649,31 @@ component_ref_for_mem_expr (ref) if (TREE_CODE (inner) == COMPONENT_REF) inner = component_ref_for_mem_expr (inner); - else if (! DECL_P (inner)) - inner = NULL_TREE; + else + { + tree placeholder_ptr = 0; + + /* Now remove any conversions: they don't change what the underlying + object is. Likewise for SAVE_EXPR. Also handle PLACEHOLDER_EXPR. */ + while (TREE_CODE (inner) == NOP_EXPR || TREE_CODE (inner) == CONVERT_EXPR + || TREE_CODE (inner) == NON_LVALUE_EXPR + || TREE_CODE (inner) == VIEW_CONVERT_EXPR + || TREE_CODE (inner) == SAVE_EXPR + || TREE_CODE (inner) == PLACEHOLDER_EXPR) + if (TREE_CODE (inner) == PLACEHOLDER_EXPR) + inner = find_placeholder (inner, &placeholder_ptr); + else + inner = TREE_OPERAND (inner, 0); + + if (! DECL_P (inner)) + inner = NULL_TREE; + } if (inner == TREE_OPERAND (ref, 0)) return ref; else - return build (COMPONENT_REF, TREE_TYPE (ref), inner, TREE_OPERAND (ref, 1)); + return build (COMPONENT_REF, TREE_TYPE (ref), inner, + TREE_OPERAND (ref, 1)); } /* Given REF, a MEM, and T, either the type of X or the expression @@ -1723,10 +1741,12 @@ set_mem_attributes (ref, t, objectp) if (TREE_THIS_VOLATILE (t)) MEM_VOLATILE_P (ref) = 1; - /* Now remove any NOPs: they don't change what the underlying object is. - Likewise for SAVE_EXPR. */ + /* Now remove any conversions: they don't change what the underlying + object is. Likewise for SAVE_EXPR. */ while (TREE_CODE (t) == NOP_EXPR || TREE_CODE (t) == CONVERT_EXPR - || TREE_CODE (t) == NON_LVALUE_EXPR || TREE_CODE (t) == SAVE_EXPR) + || TREE_CODE (t) == NON_LVALUE_EXPR + || TREE_CODE (t) == VIEW_CONVERT_EXPR + || TREE_CODE (t) == SAVE_EXPR) t = TREE_OPERAND (t, 0); /* If this expression can't be addressed (e.g., it contains a reference -- 2.30.2