Re: [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings

From: Athira Rajeev
Date: Fri Apr 29 2022 - 05:22:01 EST




> On 29-Apr-2022, at 1:59 AM, Ian Rogers <irogers@xxxxxxxxxx> wrote:
>
> BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert.
> Compiling with NDEBUG yields:
>
> bench/numa.c: In function ‘bind_to_cpu’:
> bench/numa.c:314:1: error: control reaches end of non-void function [-Werror=return-type]
> 314 | }
> | ^
> bench/numa.c: In function ‘bind_to_node’:
> bench/numa.c:367:1: error: control reaches end of non-void function [-Werror=return-type]
> 367 | }
> | ^
>
> Add return statements to cover this case.

Looks fine to me

Reviewed-by: Athira Rajeev <atrajeev@xxxxxxxxxxxxxxxxxx>

Thanks
Athira
>
> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
> tools/perf/bench/numa.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
> index 44e1f8a44087..d5289fa58a4f 100644
> --- a/tools/perf/bench/numa.c
> +++ b/tools/perf/bench/numa.c
> @@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu)
>
> /* BUG_ON due to failure in allocation of orig_mask/mask */
> BUG_ON(-1);
> + return NULL;
> }
>
> static cpu_set_t *bind_to_node(int target_node)
> @@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node)
>
> /* BUG_ON due to failure in allocation of orig_mask/mask */
> BUG_ON(-1);
> + return NULL;
> }
>
> static void bind_to_cpumask(cpu_set_t *mask)
> --
> 2.36.0.464.gb9c8b46e94-goog
>