baraba/bux-lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(qbe): no-else uses @lEnd target, removed bodyTerminated, brace fix

Browse Source
This commit is contained in:
dimgigov
2026-06-02 13:53:52 +03:00
parent 7efa79d46f
commit 6cb5528a4d
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_selfhost/src/qbe_backend.bux
+15 -5
View File
@@ -690,7 +690,12 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
QBE_Emit(qbe, ", "); QBE_Emit(qbe, ", ");
QBE_Emit(qbe, lThen); QBE_Emit(qbe, lThen);
QBE_Emit(qbe, ", "); QBE_Emit(qbe, ", ");
QBE_EmitLine(qbe, lElse); var hasElse: bool = node.child3 != null as *HirNode;
if hasElse {
QBE_EmitLine(qbe, lElse);
} else {
QBE_EmitLine(qbe, lEnd);
}
QBE_EmitLine(qbe, lThen); QBE_EmitLine(qbe, lThen);
QBE_EmitStmt(qbe, node.child2); QBE_EmitStmt(qbe, node.child2);
@@ -700,8 +705,8 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
QBE_EmitLine(qbe, lEnd); QBE_EmitLine(qbe, lEnd);
} }
QBE_EmitLine(qbe, lElse); if hasElse {
if node.child3 != null as *HirNode { QBE_EmitLine(qbe, lElse);
QBE_EmitStmt(qbe, node.child3); QBE_EmitStmt(qbe, node.child3);
if !QBE_IsTerminator(node.child3) { if !QBE_IsTerminator(node.child3) {
QBE_EmitIndent(qbe); QBE_EmitIndent(qbe);
@@ -710,13 +715,18 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
} }
} }
// Only emit @lEnd if at least one branch falls through (doesn't return) // Only emit @lEnd if at least one branch falls through
var needEnd: bool = !QBE_IsTerminator(node.child2); var needEnd: bool = !QBE_IsTerminator(node.child2);
if node.child3 != null as *HirNode && !QBE_IsTerminator(node.child3) { if hasElse && !QBE_IsTerminator(node.child3) {
needEnd = true; needEnd = true;
} }
if needEnd { if needEnd {
QBE_EmitLine(qbe, lEnd); QBE_EmitLine(qbe, lEnd);
} else {
// lEnd is unreferenced, but was used in jnz when !hasElse — need to emit it
if !hasElse {
QBE_EmitLine(qbe, lEnd);
}
} }
return; return;
} }
src_bux/qbe_backend.bux
+15 -5
View File
@@ -690,7 +690,12 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
QBE_Emit(qbe, ", "); QBE_Emit(qbe, ", ");
QBE_Emit(qbe, lThen); QBE_Emit(qbe, lThen);
QBE_Emit(qbe, ", "); QBE_Emit(qbe, ", ");
QBE_EmitLine(qbe, lElse); var hasElse: bool = node.child3 != null as *HirNode;
if hasElse {
QBE_EmitLine(qbe, lElse);
} else {
QBE_EmitLine(qbe, lEnd);
}
QBE_EmitLine(qbe, lThen); QBE_EmitLine(qbe, lThen);
QBE_EmitStmt(qbe, node.child2); QBE_EmitStmt(qbe, node.child2);
@@ -700,8 +705,8 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
QBE_EmitLine(qbe, lEnd); QBE_EmitLine(qbe, lEnd);
} }
QBE_EmitLine(qbe, lElse); if hasElse {
if node.child3 != null as *HirNode { QBE_EmitLine(qbe, lElse);
QBE_EmitStmt(qbe, node.child3); QBE_EmitStmt(qbe, node.child3);
if !QBE_IsTerminator(node.child3) { if !QBE_IsTerminator(node.child3) {
QBE_EmitIndent(qbe); QBE_EmitIndent(qbe);
@@ -710,13 +715,18 @@ func QBE_EmitStmt(qbe: *QbeEmitter, node: *HirNode) {
} }
} }
// Only emit @lEnd if at least one branch falls through (doesn't return) // Only emit @lEnd if at least one branch falls through
var needEnd: bool = !QBE_IsTerminator(node.child2); var needEnd: bool = !QBE_IsTerminator(node.child2);
if node.child3 != null as *HirNode && !QBE_IsTerminator(node.child3) { if hasElse && !QBE_IsTerminator(node.child3) {
needEnd = true; needEnd = true;
} }
if needEnd { if needEnd {
QBE_EmitLine(qbe, lEnd); QBE_EmitLine(qbe, lEnd);
} else {
// lEnd is unreferenced, but was used in jnz when !hasElse — need to emit it
if !hasElse {
QBE_EmitLine(qbe, lEnd);
}
} }
return; return;
} }