SergeychWorks/lyng
1
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 21 Wiki Activity

Elide redundant bool conversions in logical ops

Browse Source
This commit is contained in:
sergeych committed 2026-02-16 17:42:04 +03:00
1 parent 3e654ddd60
commit 7c28296f92
2 files changed
+11 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lynglib/src/commonMain/kotlin/net/sergeych/lyng/bytecode/BytecodeCompiler.kt
+8 -32
View File
@@ -2339,60 +2339,36 @@ class BytecodeCompiler(
private fun compileLogicalAnd(ref: LogicalAndRef): CompiledValue? {
val leftValue = compileRefWithFallback(ref.left(), SlotType.BOOL, Pos.builtIn) ?: return null
val leftBool = if (leftValue.type == SlotType.BOOL) {
leftValue
} else {
val slot = allocSlot()
builder.emit(Opcode.OBJ_TO_BOOL, leftValue.slot, slot)
CompiledValue(slot, SlotType.BOOL)
}
if (leftValue.type != SlotType.BOOL) return null
val resultSlot = allocSlot()
val falseId = builder.addConst(BytecodeConst.Bool(false))
builder.emit(Opcode.CONST_BOOL, falseId, resultSlot)
val endLabel = builder.label()
builder.emit(
Opcode.JMP_IF_FALSE,
listOf(CmdBuilder.Operand.IntVal(leftBool.slot), CmdBuilder.Operand.LabelRef(endLabel))
listOf(CmdBuilder.Operand.IntVal(leftValue.slot), CmdBuilder.Operand.LabelRef(endLabel))
)
val rightValue = compileRefWithFallback(ref.right(), SlotType.BOOL, Pos.builtIn) ?: return null
val rightBool = if (rightValue.type == SlotType.BOOL) {
rightValue
} else {
val slot = allocSlot()
builder.emit(Opcode.OBJ_TO_BOOL, rightValue.slot, slot)
CompiledValue(slot, SlotType.BOOL)
}
builder.emit(Opcode.MOVE_BOOL, rightBool.slot, resultSlot)
if (rightValue.type != SlotType.BOOL) return null
builder.emit(Opcode.MOVE_BOOL, rightValue.slot, resultSlot)
builder.mark(endLabel)
return CompiledValue(resultSlot, SlotType.BOOL)
}
private fun compileLogicalOr(ref: LogicalOrRef): CompiledValue? {
val leftValue = compileRefWithFallback(ref.left(), SlotType.BOOL, Pos.builtIn) ?: return null
val leftBool = if (leftValue.type == SlotType.BOOL) {
leftValue
} else {
val slot = allocSlot()
builder.emit(Opcode.OBJ_TO_BOOL, leftValue.slot, slot)
CompiledValue(slot, SlotType.BOOL)
}
if (leftValue.type != SlotType.BOOL) return null
val resultSlot = allocSlot()
val trueId = builder.addConst(BytecodeConst.Bool(true))
builder.emit(Opcode.CONST_BOOL, trueId, resultSlot)
val endLabel = builder.label()
builder.emit(
Opcode.JMP_IF_TRUE,
listOf(CmdBuilder.Operand.IntVal(leftBool.slot), CmdBuilder.Operand.LabelRef(endLabel))
listOf(CmdBuilder.Operand.IntVal(leftValue.slot), CmdBuilder.Operand.LabelRef(endLabel))
)
val rightValue = compileRefWithFallback(ref.right(), SlotType.BOOL, Pos.builtIn) ?: return null
val rightBool = if (rightValue.type == SlotType.BOOL) {
rightValue
} else {
val slot = allocSlot()
builder.emit(Opcode.OBJ_TO_BOOL, rightValue.slot, slot)
CompiledValue(slot, SlotType.BOOL)
}
builder.emit(Opcode.MOVE_BOOL, rightBool.slot, resultSlot)
if (rightValue.type != SlotType.BOOL) return null
builder.emit(Opcode.MOVE_BOOL, rightValue.slot, resultSlot)
builder.mark(endLabel)
return CompiledValue(resultSlot, SlotType.BOOL)
}