diff options
author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-03 21:40:04 +0100 |
---|---|---|
committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-03 21:40:04 +0100 |
commit | afae4a55ccaa0de95ea11e5f634084db6ab2f444 (patch) | |
tree | d632cc867d10410ba9fb750523be790b86846ac4 /gcc/explow.c | |
parent | 9d9a82ec8478ff52c7a9d61f58cd2a7b6295b5f9 (diff) | |
parent | d2eb616a0f7bea78164912aa438c29fe1ef5774a (diff) | |
download | gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.zip gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.tar.gz gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.tar.bz2 |
Merge branch 'master' into devel/coarray_native
Diffstat (limited to 'gcc/explow.c')
-rw-r--r-- | gcc/explow.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/explow.c b/gcc/explow.c index 0fbc6d2..65f904a 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -27,9 +27,9 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "memmodel.h" #include "tm_p.h" +#include "optabs.h" #include "expmed.h" #include "profile-count.h" -#include "optabs.h" #include "emit-rtl.h" #include "recog.h" #include "diagnostic-core.h" @@ -1583,10 +1583,14 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align, OFFSET is the offset of the area into the virtual stack vars area. REQUIRED_ALIGN is the alignment (in bits) required for the region - of memory. */ + of memory. + + BASE is the rtx of the base of this virtual stack vars area. + The only time this is not `virtual_stack_vars_rtx` is when tagging pointers + on the stack. */ rtx -get_dynamic_stack_base (poly_int64 offset, unsigned required_align) +get_dynamic_stack_base (poly_int64 offset, unsigned required_align, rtx base) { rtx target; @@ -1594,7 +1598,7 @@ get_dynamic_stack_base (poly_int64 offset, unsigned required_align) crtl->preferred_stack_boundary = PREFERRED_STACK_BOUNDARY; target = gen_reg_rtx (Pmode); - emit_move_insn (target, virtual_stack_vars_rtx); + emit_move_insn (target, base); target = expand_binop (Pmode, add_optab, target, gen_int_mode (offset, Pmode), NULL_RTX, 1, OPTAB_LIB_WIDEN); |