Bootstrapped & regression-tested on x86_64-linux-gnu :) 2015-07-08 Kito Cheng <kito.ch...@gmail.com>
* function.c (stack_protect_epilogue): Use if rather than switch for check targetm.have_stack_protect_test().
From 0306990aac578167872a80ab55085d335e2bea14 Mon Sep 17 00:00:00 2001 From: Kito Cheng <k...@andestech.com> Date: Wed, 8 Jul 2015 15:20:01 +0800 Subject: [PATCH] Drop -Wswitch-bool warning in function.c --- gcc/function.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gcc/function.c b/gcc/function.c index 972cdc8..b87aef6 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4874,26 +4874,18 @@ stack_protect_epilogue (void) tree guard_decl = targetm.stack_protect_guard (); rtx_code_label *label = gen_label_rtx (); rtx x, y, tmp; + rtx_insn *seq; x = expand_normal (crtl->stack_protect_guard); y = expand_normal (guard_decl); /* Allow the target to compare Y with X without leaking either into a register. */ - switch (targetm.have_stack_protect_test ()) - { - case 1: - if (rtx_insn *seq = targetm.gen_stack_protect_test (x, y, label)) - { - emit_insn (seq); - break; - } - /* FALLTHRU */ - - default: - emit_cmp_and_jump_insns (x, y, EQ, NULL_RTX, ptr_mode, 1, label); - break; - } + if (targetm.have_stack_protect_test () + && ((seq = targetm.gen_stack_protect_test (x, y, label)) != NULL_RTX)) + emit_insn (seq); + else + emit_cmp_and_jump_insns (x, y, EQ, NULL_RTX, ptr_mode, 1, label); /* The noreturn predictor has been moved to the tree level. The rtl-level predictors estimate this branch about 20%, which isn't enough to get -- 2.3.5