Don't try patching anything if builder is in the error state

Daft-Freak · Daft-Freak · commit 8ccc834a711c · 2026-02-03T17:13:36.000Z
Good way to crash/assert fail
diff --git a/core/compiler/X86Target.cpp b/core/compiler/X86Target.cpp
@@ -63,7 +63,7 @@ static bool doRegImmShift32(X86Builder &builder, std::optional<Reg32> dst, std::
 
         auto patchCondBranch = [&builder](uint8_t *branchPtr, Condition cond)
         {
-            if(!branchPtr)
+            if(!branchPtr || builder.getError())
                 return;
 
             auto off = builder.getPtr() - branchPtr - 2;
@@ -74,7 +74,7 @@ static bool doRegImmShift32(X86Builder &builder, std::optional<Reg32> dst, std::
 
         auto patchBranch = [&builder](uint8_t *branchPtr)
         {
-            if(!branchPtr)
+            if(!branchPtr || builder.getError())
                 return;
 
             auto off = builder.getPtr() - branchPtr - 2;

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static bool doRegImmShift32(X86Builder &builder, std::optional<Reg32> dst, std::`
`63`	`63`
`64`	`64`	`auto patchCondBranch = [&builder](uint8_t *branchPtr, Condition cond)`
`65`	`65`	`{`
`66`		`- if(!branchPtr)`
	`66`	`+ if(!branchPtr \|\| builder.getError())`
`67`	`67`	`return;`
`68`	`68`
`69`	`69`	`auto off = builder.getPtr() - branchPtr - 2;`
`@@ -74,7 +74,7 @@ static bool doRegImmShift32(X86Builder &builder, std::optional<Reg32> dst, std::`
`74`	`74`
`75`	`75`	`auto patchBranch = [&builder](uint8_t *branchPtr)`
`76`	`76`	`{`
`77`		`- if(!branchPtr)`
	`77`	`+ if(!branchPtr \|\| builder.getError())`
`78`	`78`	`return;`
`79`	`79`
`80`	`80`	`auto off = builder.getPtr() - branchPtr - 2;`