compiler: declare symbols before store so that symbol graph works

This commit is contained in:
Alex Zenla 2023-11-29 15:03:22 -08:00
parent 3dbf8f9c4a
commit 962d079acc
Signed by: alex
GPG Key ID: C0780728420EBFE5
4 changed files with 20 additions and 2 deletions

View File

@ -0,0 +1,10 @@
package gay.pizza.pork.bir
import kotlinx.serialization.Serializable
@Serializable
data class IrDeclare(override val symbol: IrSymbol, val value: IrCodeElement) : IrCodeElement, IrSymbolOwner {
override fun crawl(block: (IrElement) -> Unit) {
value.crawl(block)
}
}

View File

@ -29,6 +29,7 @@ interface IrVisitor<T> {
fun visitIrFunctionArgument(ir: IrFunctionArgument): T
fun visitIrIndex(ir: IrIndex): T
fun visitIrListSize(ir: IrListSize): T
fun visitIrDeclare(ir: IrDeclare): T
fun visit(ir: IrElement): T = when (ir) {
is IrBreak -> visitIrBeak(ir)
@ -59,5 +60,6 @@ interface IrVisitor<T> {
is IrFunctionArgument -> visitIrFunctionArgument(ir)
is IrIndex -> visitIrIndex(ir)
is IrListSize -> visitIrListSize(ir)
is IrDeclare -> visitIrDeclare(ir)
}
}

View File

@ -241,7 +241,7 @@ class IrCodeEmitter(
override fun visitLetAssignment(node: LetAssignment): IrCodeElement {
val symbol = createLocalVariable(node.symbol)
return IrStore(symbol, node.value.visit(this))
return IrDeclare(symbol, node.value.visit(this))
}
override fun visitListLiteral(node: ListLiteral): IrCodeElement =
@ -296,7 +296,7 @@ class IrCodeEmitter(
override fun visitVarAssignment(node: VarAssignment): IrCodeElement {
val local = createLocalVariable(node.symbol)
return IrStore(local, node.value.visit(this))
return IrDeclare(local, node.value.visit(this))
}
override fun visitWhile(node: While): IrCodeElement = loop { symbol ->

View File

@ -188,6 +188,12 @@ class IrStubOpEmitter(val irDefinition: IrDefinition, val code: CodeBuilder) : I
code.emit(Opcode.Return)
}
override fun visitIrDeclare(ir: IrDeclare) {
visit(ir.value)
val variable = code.localState.createOrFindLocal(ir.symbol)
store(variable)
}
override fun visitIrStore(ir: IrStore) {
visit(ir.value)
val variable = code.localState.createOrFindLocal(ir.target)