Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-03 11:32:41 +00:00
Code Issues Projects Releases Wiki Activity

ir: fix unused code remover

Browse Source
This commit is contained in:
Irmen de Jong 2022-11-02 23:54:52 +01:00
parent e094785cbd
commit 3603140114
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
codeGenIntermediate/src/prog8/codegen/intermediate/IRUnusedCodeRemover.kt
View File

@ -2,8 +2,7 @@ package prog8.codegen.intermediate
import prog8.code.core.IErrorReporter import prog8.code.core.IErrorReporter
import prog8.code.core.SourceCode.Companion.libraryFilePrefix import prog8.code.core.SourceCode.Companion.libraryFilePrefix
import prog8.intermediate.IRCodeChunkBase import prog8.intermediate.*
import prog8.intermediate.IRProgram
internal class IRUnusedCodeRemover(private val irprog: IRProgram, private val errors: IErrorReporter) { internal class IRUnusedCodeRemover(private val irprog: IRProgram, private val errors: IErrorReporter) {
@ -40,7 +39,7 @@ internal class IRUnusedCodeRemover(private val irprog: IRProgram, private val er
val new = mutableSetOf<IRCodeChunkBase>() val new = mutableSetOf<IRCodeChunkBase>()
reachable.forEach { reachable.forEach {
it.next?.let { next -> new += next } it.next?.let { next -> new += next }
it.instructions.forEach { it.branchTarget?.let { target -> new += target} } it.instructions.forEach { instr -> instr.branchTarget?.let { target -> new += target} }
} }
reachable += new reachable += new
} }
@ -76,16 +75,24 @@ internal class IRUnusedCodeRemover(private val irprog: IRProgram, private val er
): Int { ): Int {
var numRemoved = 0 var numRemoved = 0
irprog.blocks.asSequence().flatMap { it.subroutines }.forEach { sub -> irprog.blocks.asSequence().flatMap { it.subroutines }.forEach { sub ->
sub.chunks.reversed().forEach { chunk -> sub.chunks.withIndex().reversed().forEach { (index, chunk) ->
if (chunk !in linkedChunks) { if (chunk !in linkedChunks) {
if (chunk === sub.chunks[0]) { if (chunk === sub.chunks[0]) {
if (chunk.instructions.isNotEmpty()) { when(chunk) {
is IRCodeChunk -> {
if (chunk.isNotEmpty()) {
// don't remove the first chunk of the sub itself because it has to have the name of the sub as label // don't remove the first chunk of the sub itself because it has to have the name of the sub as label
chunk.instructions.clear() chunk.instructions.clear()
numRemoved++ numRemoved++
} }
}
is IRInlineAsmChunk, is IRInlineBinaryChunk -> {
sub.chunks[index] = IRCodeChunk(chunk.label, chunk.next)
numRemoved++
}
}
} else { } else {
sub.chunks.remove(chunk) sub.chunks.removeAt(index)
numRemoved++ numRemoved++
} }
} }