backport: re PR target/85993 (config/sh/sh.c:10878: suspicious if .. else chain)

gcc/
2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>

	Backport from mainline
	2018-07-15  Jeff Law  <law@redhat.com>

	PR target/85993
	* config/sh/sh.c (output_mi_thunk): Remove dead conditional
	block.

From-SVN: r276239

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6cc435da536e5f3457cd495fa4923e34498ba05f..3828edd0fb243754841cf564b4fec9d98f02f3ad 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>
+
+       Backport from mainline
+       2018-07-15  Jeff Law  <law@redhat.com>
+
+       PR target/85993
+       * config/sh/sh.c (output_mi_thunk): Remove dead conditional
+       block.
+
 2019-09-27  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backport from mainline

diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index ff79b93adc263e02114c815ff3706ad57d5cad60..11f121d716276b8a4b9a278757f77d8488a15624 100644 (file)
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -10814,12 +10814,6 @@ sh_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
          emit_insn (gen_add2_insn (scratch0, GEN_INT (vcall_offset)));
          offset_addr = scratch0;
        }
-      else if (scratch0 != scratch1)
-       {
-         emit_move_insn (scratch1, GEN_INT (vcall_offset));
-         emit_insn (gen_add2_insn (scratch0, scratch1));
-         offset_addr = scratch0;
-       }
       else
        gcc_unreachable (); /* FIXME */
       emit_load_ptr (scratch0, offset_addr);