diff options
Diffstat (limited to 'gcc/function.c')
| -rw-r--r-- | gcc/function.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gcc/function.c b/gcc/function.c index d0e5fd3..b84fc1e 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -2813,10 +2813,10 @@ static int cfa_offset; #define ARG_POINTER_CFA_OFFSET(FNDECL) FIRST_PARM_OFFSET (FNDECL) #endif -/* Build up a (MEM (ADDRESSOF (REG))) rtx for a register REG that just had - its address taken. DECL is the decl for the object stored in the - register, for later use if we do need to force REG into the stack. - REG is overwritten by the MEM like in put_reg_into_stack. */ +/* Build up a (MEM (ADDRESSOF (REG))) rtx for a register REG that just had its + address taken. DECL is the decl or SAVE_EXPR for the object stored in the + register, for later use if we do need to force REG into the stack. REG is + overwritten by the MEM like in put_reg_into_stack. */ rtx gen_mem_addressof (reg, decl) @@ -2842,24 +2842,24 @@ gen_mem_addressof (reg, decl) { tree type = TREE_TYPE (decl); enum machine_mode decl_mode - = (TREE_CODE (decl) == SAVE_EXPR ? TYPE_MODE (TREE_TYPE (decl)) - : DECL_MODE (decl)); - rtx decl_rtl = decl ? DECL_RTL_IF_SET (decl) : 0; + = (DECL_P (decl) ? DECL_MODE (decl) : TYPE_MODE (TREE_TYPE (decl))); + rtx decl_rtl = (TREE_CODE (decl) == SAVE_EXPR ? SAVE_EXPR_RTL (decl) + : DECL_RTL_IF_SET (decl)); PUT_MODE (reg, decl_mode); /* Clear DECL_RTL momentarily so functions below will work properly, then set it again. */ - if (decl_rtl == reg) + if (DECL_P (decl) && decl_rtl == reg) SET_DECL_RTL (decl, 0); set_mem_attributes (reg, decl, 1); set_mem_alias_set (reg, set); - if (decl_rtl == reg) + if (DECL_P (decl) && decl_rtl == reg) SET_DECL_RTL (decl, reg); - if (TREE_USED (decl) || DECL_INITIAL (decl) != 0) + if (TREE_USED (decl) || (DECL_P (decl) && DECL_INITIAL (decl) != 0)) fixup_var_refs (reg, GET_MODE (reg), TREE_UNSIGNED (type), 0); } else @@ -2904,8 +2904,7 @@ put_addressof_into_stack (r, ht) volatile_p = (TREE_CODE (decl) != SAVE_EXPR && TREE_THIS_VOLATILE (decl)); used_p = (TREE_USED (decl) - || (TREE_CODE (decl) != SAVE_EXPR - && DECL_INITIAL (decl) != 0)); + || (DECL_P (decl) && DECL_INITIAL (decl) != 0)); } else { |