From 4e411e8526df0c627c5ab0e6338853a82a51c0b2 Mon Sep 17 00:00:00 2001
From: bbbradsmith <bbbradsmith@users.noreply.github.com>
Date: Sat, 18 Feb 2023 00:13:34 -0500
Subject: [PATCH] Opt_a_tosicmp likely has a bug which will incorrectly migrate
 a label on a replaced op in one case.

---
 src/cc65/coptstop.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc65/coptstop.c b/src/cc65/coptstop.c
index 8b2821dcd..ae40a55e9 100644
--- a/src/cc65/coptstop.c
+++ b/src/cc65/coptstop.c
@@ -1208,6 +1208,8 @@ static unsigned Opt_a_tosicmp (StackOpData* D)
             /* RHS src is not directly comparable */
             X = NewCodeEntry (OP65_STA, AM65_ZP, D->ZPHi, 0, D->OpEntry->LI);
             InsertEntry (D, X, D->Rhs.A.ChgIndex + 1);
+            /* RHS insertion may have moved the OpIndex, recalculate insertion point to prevent label migration. */
+            D->IP = D->OpIndex + 1;
 
             /* Cmp with stored RHS */
             X = NewCodeEntry (OP65_CMP, AM65_ZP, D->ZPHi, 0, D->OpEntry->LI);