Devirtualization bug fix with main (#1945)

Added explicit handling of arguments of <main>
This commit is contained in:
Igor Chevdar
2018-08-27 17:55:11 +03:00
committed by Nikolay Igotti
parent 32fe05afa2
commit cc28f81ff0
@@ -242,6 +242,9 @@ internal object Devirtualization {
.filterIsInstance<DataFlowIR.Type.Public>() .filterIsInstance<DataFlowIR.Type.Public>()
.filter { !it.isAbstract } .filter { !it.isAbstract }
.forEach { addInstantiatingClass(it) } .forEach { addInstantiatingClass(it) }
} else {
// String is implicitly created as argument of <main>.
addInstantiatingClass(symbolTable.mapType(context.irBuiltIns.stringType))
} }
// Traverse call graph from the roots. // Traverse call graph from the roots.
rootSet.forEach { dfs(it) } rootSet.forEach { dfs(it) }
@@ -690,6 +693,12 @@ internal object Devirtualization {
private var stack = mutableListOf<DataFlowIR.FunctionSymbol>() private var stack = mutableListOf<DataFlowIR.FunctionSymbol>()
fun build() { fun build() {
if (entryPoint != null) {
// String arguments are implicitly put into the <args> array parameter of <main>.
concreteClass(symbolTable.mapType(context.irBuiltIns.stringType).resolved()).addEdge(
fieldNode(constraintGraph.arrayItemField)
)
}
rootSet.forEach { createFunctionConstraintGraph(it, true)!! } rootSet.forEach { createFunctionConstraintGraph(it, true)!! }
while (stack.isNotEmpty()) { while (stack.isNotEmpty()) {
val symbol = stack.pop() val symbol = stack.pop()