From acbfebfbb30807964cec09cd2942c992bc106be0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 16 Apr 2018 19:05:09 +0000 Subject: [PATCH] i386: Pass INVALID_REGNUM as invalid register number Backport from mainline * config/i386/i386.c (ix86_output_function_return): Pass INVALID_REGNUM, instead of -1, as invalid register number to indirect_thunk_name and output_indirect_thunk. From-SVN: r259419 --- gcc/ChangeLog | 9 +++++++++ gcc/config/i386/i386.c | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 52b7e7403141..61e223959983 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-04-16 H.J. Lu + + Backport from mainline + 2018-02-02 H.J. Lu + + * config/i386/i386.c (ix86_output_function_return): Pass + INVALID_REGNUM, instead of -1, as invalid register number to + indirect_thunk_name and output_indirect_thunk. + 2018-04-16 H.J. Lu Backport from mainline diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 40126579c223..66502ee6da6b 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -28056,7 +28056,8 @@ ix86_output_function_return (bool long_p) { bool need_thunk = (cfun->machine->function_return_type == indirect_branch_thunk); - indirect_thunk_name (thunk_name, -1, need_bnd_p, true); + indirect_thunk_name (thunk_name, INVALID_REGNUM, need_bnd_p, + true); if (need_bnd_p) { indirect_thunk_bnd_needed |= need_thunk; @@ -28069,7 +28070,7 @@ ix86_output_function_return (bool long_p) } } else - output_indirect_thunk (need_bnd_p, -1); + output_indirect_thunk (need_bnd_p, INVALID_REGNUM); return ""; } -- 2.47.2