diff --git a/target-arm/translate.c b/target-arm/translate.c
index 3ec758ad6f..bac2e6174f 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -11209,8 +11209,7 @@ static bool insn_crosses_page(CPUARMState *env, DisasContext *s)
     return false;
 }
 
-/* generate intermediate code in gen_opc_buf and gen_opparam_buf for
-   basic block 'tb'.  */
+/* generate intermediate code for basic block 'tb'.  */
 void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb)
 {
     ARMCPU *cpu = arm_env_get_cpu(env);
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 73a45c872e..2dde47675e 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -7878,8 +7878,7 @@ void tcg_x86_init(void)
     helper_lock_init();
 }
 
-/* generate intermediate code in gen_opc_buf and gen_opparam_buf for
-   basic block 'tb'.  */
+/* generate intermediate code for basic block 'tb'.  */
 void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb)
 {
     X86CPU *cpu = x86_env_get_cpu(env);
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 7dbfe3bd03..ec2cc13eb6 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -1860,8 +1860,7 @@ static void disas_uc32_insn(CPUUniCore32State *env, DisasContext *s)
     }
 }
 
-/* generate intermediate code in gen_opc_buf and gen_opparam_buf for
-   basic block 'tb'.  */
+/* generate intermediate code for basic block 'tb'.  */
 void gen_intermediate_code(CPUUniCore32State *env, TranslationBlock *tb)
 {
     UniCore32CPU *cpu = uc32_env_get_cpu(env);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index cd62d81c2a..e6e844ca57 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1576,8 +1576,7 @@ static void tcg_liveness_analysis(TCGContext *s)
 /* dummy liveness analysis */
 static void tcg_liveness_analysis(TCGContext *s)
 {
-    int nb_ops;
-    nb_ops = s->gen_opc_ptr - s->gen_opc_buf;
+    int nb_ops = s->gen_next_op_idx;
 
     s->op_dead_args = tcg_malloc(nb_ops * sizeof(uint16_t));
     memset(s->op_dead_args, 0, nb_ops * sizeof(uint16_t));