Fixes for clang-13 plus tcg/ppc

[PATCH 02/11] accel/tcg: Remove unused variable in cpu_exec

Posted by Richard Henderson 4 years, 7 months ago

From clang-13:
accel/tcg/cpu-exec.c:783:15: error: variable 'cc' set but not used \
    [-Werror,-Wunused-but-set-variable]

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cpu-exec.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index e22bcb99f7..a8d8cea586 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -780,7 +780,6 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,
 
 int cpu_exec(CPUState *cpu)
 {
-    CPUClass *cc = CPU_GET_CLASS(cpu);
     int ret;
     SyncClocks sc = { 0 };
 
@@ -819,14 +818,12 @@ int cpu_exec(CPUState *cpu)
          * so we only perform the workaround for clang.
          */
         cpu = current_cpu;
-        cc = CPU_GET_CLASS(cpu);
 #else
         /*
          * Non-buggy compilers preserve these locals; assert that
          * they have the correct value.
          */
         g_assert(cpu == current_cpu);
-        g_assert(cc == CPU_GET_CLASS(cpu));
 #endif
 
 #ifndef CONFIG_SOFTMMU
-- 
2.25.1

Re: [PATCH 02/11] accel/tcg: Remove unused variable in cpu_exec

Posted by Philippe Mathieu-Daudé 4 years, 7 months ago

On 7/12/21 11:55 PM, Richard Henderson wrote:
> From clang-13:
> accel/tcg/cpu-exec.c:783:15: error: variable 'cc' set but not used \
>     [-Werror,-Wunused-but-set-variable]
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  accel/tcg/cpu-exec.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index e22bcb99f7..a8d8cea586 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -780,7 +780,6 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,
>  
>  int cpu_exec(CPUState *cpu)
>  {
> -    CPUClass *cc = CPU_GET_CLASS(cpu);
>      int ret;
>      SyncClocks sc = { 0 };
>  
> @@ -819,14 +818,12 @@ int cpu_exec(CPUState *cpu)
>           * so we only perform the workaround for clang.
>           */
>          cpu = current_cpu;
> -        cc = CPU_GET_CLASS(cpu);
>  #else
>          /*
>           * Non-buggy compilers preserve these locals; assert that
>           * they have the correct value.

Maybe update comment to singular, otherwise:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>           */
>          g_assert(cpu == current_cpu);
> -        g_assert(cc == CPU_GET_CLASS(cpu));
>  #endif
>  
>  #ifndef CONFIG_SOFTMMU
>