[43/46] tcg/optimize: Use finish_folding as default in tcg_optimize

Commit Message

Richard Henderson Dec. 10, 2024, 3:23 p.m. UTC

All non-default cases now finish folding within each function.
Do the same with the default case and assert it is done after.

Signed-off-by: Richard Henderson <[e-mail]>
---
 tcg/optimize.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Pierrick Bouvier Dec. 17, 2024, 8:46 p.m. UTC | #1

On 12/10/24 07:23, Richard Henderson wrote:
> All non-default cases now finish folding within each function.
> Do the same with the default case and assert it is done after.
> 
> Signed-off-by: Richard Henderson <[e-mail]>
> ---
>   tcg/optimize.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index 24ec14f476..94e942e1cf 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -3085,11 +3085,9 @@ void tcg_optimize(TCGContext *s)
>               done = true;
>               break;
>           default:
> +            done = finish_folding(&ctx, op);
>               break;
>           }
> -
> -        if (!done) {
> -            finish_folding(&ctx, op);
> -        }
> +        tcg_debug_assert(done);
>       }
>   }

Reviewed-by: Pierrick Bouvier <[e-mail]>

Patch

diff --git a/tcg/optimize.c b/tcg/optimize.c
index 24ec14f476..94e942e1cf 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -3085,11 +3085,9 @@  void tcg_optimize(TCGContext *s)
             done = true;
             break;
         default:
+            done = finish_folding(&ctx, op);
             break;
         }
-
-        if (!done) {
-            finish_folding(&ctx, op);
-        }
+        tcg_debug_assert(done);
     }
 }