Merge pull request #512 from Wuerfel21/w21-fix-evans-sdsd-crash

totalspectrum · web-flow · commit 6501f45cdd5d · 2026-06-14T19:51:12.000-03:00
Fix crash reported by evanh and add extra safety check
diff --git a/backends/asm/optimize_ir.c b/backends/asm/optimize_ir.c
@@ -3710,7 +3710,7 @@ OptimizePeepholes(IRList *irl)
                     if (test_is_z && InstrUsesFlags(testir, FLAG_WC)) {
                         changeok = false;
                     } else if (InstrSetsAnyFlags(testir)) {
-                        changeok = sawir;
+                        changeok = sawir && (test_is_c || !FlagsUsedAt(testir,FLAG_WZ));
                         lastir = testir;
                         break;
                     }
@@ -3726,7 +3726,7 @@ OptimizePeepholes(IRList *irl)
                         {
                             ReplaceZWithNC(testir);
                         }
-                        if (IsBranch(lastir)) {
+                        if (lastir != NULL && IsBranch(lastir)) {
                             ReplaceZWithNC(lastir);
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -3710,7 +3710,7 @@ OptimizePeepholes(IRList *irl)`
`3710`	`3710`	`if (test_is_z && InstrUsesFlags(testir, FLAG_WC)) {`
`3711`	`3711`	`changeok = false;`
`3712`	`3712`	`} else if (InstrSetsAnyFlags(testir)) {`
`3713`		`- changeok = sawir;`
	`3713`	`+ changeok = sawir && (test_is_c \|\| !FlagsUsedAt(testir,FLAG_WZ));`
`3714`	`3714`	`lastir = testir;`
`3715`	`3715`	`break;`
`3716`	`3716`	`}`
`@@ -3726,7 +3726,7 @@ OptimizePeepholes(IRList *irl)`
`3726`	`3726`	`{`
`3727`	`3727`	`ReplaceZWithNC(testir);`
`3728`	`3728`	`}`
`3729`		`- if (IsBranch(lastir)) {`
	`3729`	`+ if (lastir != NULL && IsBranch(lastir)) {`
`3730`	`3730`	`ReplaceZWithNC(lastir);`
`3731`	`3731`	`}`
`3732`	`3732`	`}`