Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-10-15 02:18:26 +00:00
Code Issues Projects Releases Wiki Activity

fix invalid recursion warning for code referencing subroutine but not via a call

Browse Source
This commit is contained in:
Irmen de Jong
2022-02-01 23:09:52 +01:00
parent ab61b8ba0a
commit 69b9dfa468
4 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compilerInterfaces/src/prog8/compilerinterface/CallGraph.kt
View File

@@ -15,6 +15,7 @@ class CallGraph(private val program: Program) : IAstVisitor {
val importedBy = mutableMapOf<Module, Set<Module>>().withDefault { setOf() }
val calls = mutableMapOf<Subroutine, Set<Subroutine>>().withDefault { setOf() }
val calledBy = mutableMapOf<Subroutine, Set<Node>>().withDefault { setOf() }
val notCalledButReferenced = mutableSetOf<Subroutine>()
private val allIdentifiersAndTargets = mutableMapOf<IdentifierReference, Statement>()
private val allAssemblyNodes = mutableListOf<InlineAssembly>()
@@ -25,7 +26,7 @@ class CallGraph(private val program: Program) : IAstVisitor {
val allIdentifiers: Map<IdentifierReference, Statement> = allIdentifiersAndTargets
private val usedSubroutines: Set<Subroutine> by lazy {
calledBy.keys + program.entrypoint
calledBy.keys + program.entrypoint + notCalledButReferenced
}
private val usedBlocks: Set<Block> by lazy {
@@ -81,13 +82,7 @@ class CallGraph(private val program: Program) : IAstVisitor {
}
override fun visit(addressOf: AddressOf) {
val otherSub = addressOf.identifier.targetSubroutine(program)
if(otherSub!=null) {
addressOf.definingSubroutine?.let { thisSub ->
calls[thisSub] = calls.getValue(thisSub) + otherSub
calledBy[otherSub] = calledBy.getValue(otherSub) + thisSub
}
}
addressOf.identifier.targetSubroutine(program)?.let { notCalledButReferenced.add(it) }
super.visit(addressOf)
}