Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
fb0adca
Draft: model synthesis
Jun 20, 2022
11c47d9
m
AbdullinAM Jun 20, 2022
4aaa8e5
first prototype, needs debugging and tuning
AbdullinAM Jun 22, 2022
9c63ba0
prototype
AbdullinAM Jun 28, 2022
707fa6d
refactor
AbdullinAM Jun 29, 2022
10c4193
very early prototype
AbdullinAM Jul 8, 2022
4285a5c
UtConstraintModel implemented
AbdullinAM Jul 12, 2022
22e2266
partial UtConstraint to UtExpression convertion
AbdullinAM Jul 14, 2022
6b47a9a
working prototypes
AbdullinAM Jul 19, 2022
a75a840
bugfixes + expression support in constraints
AbdullinAM Jul 21, 2022
fb392f6
m
AbdullinAM Jul 26, 2022
5f35311
everything kind of works, but some constraints need to be added
AbdullinAM Jul 27, 2022
ba9bb62
first working protoype with arrays
AbdullinAM Aug 1, 2022
065924f
renaming
AbdullinAM Aug 1, 2022
8cc7515
first tests and fixes
AbdullinAM Aug 2, 2022
4a14606
more expressions supported
AbdullinAM Aug 3, 2022
bbf525b
some cleanup + more expressions supported
AbdullinAM Aug 8, 2022
850b530
cleanup
AbdullinAM Aug 8, 2022
8799691
support for multidimensional arrays + fix for array generation
AbdullinAM Aug 9, 2022
60df4a4
first support of lists
AbdullinAM Aug 10, 2022
8963a7e
support sets
AbdullinAM Aug 10, 2022
1578c96
small refactorings
AbdullinAM Aug 11, 2022
1dd4b25
maps
AbdullinAM Aug 12, 2022
313757d
some cleanup and parameters
AbdullinAM Aug 12, 2022
faa0047
test write fix
AbdullinAM Aug 12, 2022
94740c9
m
AbdullinAM Aug 22, 2022
9920283
Merge branch 'main' into abdullin/constraint-model-synthesis
AbdullinAM Aug 22, 2022
fd22077
merge with master
AbdullinAM Aug 24, 2022
4e97b5f
first prototype of constraint scoring selector
AbdullinAM Aug 26, 2022
2544b31
m
AbdullinAM Aug 30, 2022
e585371
fixes
AbdullinAM Aug 31, 2022
d2564e9
Merge branch 'main' into abdullin/constraint-model-synthesis
AbdullinAM Sep 7, 2022
bb1acbc
Merge branch 'main' into abdullin/constraint-model-synthesis
AbdullinAM Sep 7, 2022
c6fbeb0
Split constraint models into a set of non-intersecting subsets before…
AbdullinAM Sep 12, 2022
2553ef7
m
AbdullinAM Sep 12, 2022
e943a16
some cleanup
AbdullinAM Sep 13, 2022
cd5fff8
more cleanup
AbdullinAM Sep 13, 2022
c2a7d31
order models in the subsets
AbdullinAM Sep 13, 2022
d1b09c8
simple caching of synthesis unit contexts
AbdullinAM Sep 13, 2022
eedccb9
option to enable/disable caching of synthesis contexts
AbdullinAM Sep 14, 2022
11eea4d
m
AbdullinAM Sep 14, 2022
9712e70
tests
AbdullinAM Sep 14, 2022
1c6b679
unit tests fixed
AbdullinAM Sep 19, 2022
4e37763
Merge branch 'main' into abdullin/constraint-model-synthesis
AbdullinAM Sep 28, 2022
34ed6fe
merge with main
AbdullinAM Sep 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support sets
  • Loading branch information
AbdullinAM committed Aug 10, 2022
commit 8963a7ea2211825717eb388901757998e66bc6dd
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,13 @@ data class UtListConstraintModel(
override val utConstraints: Set<UtConstraint> = emptySet()
) : UtElementContainerConstraintModel(variable, length, elements, utConstraints)

data class UtSetConstraintModel(
override val variable: UtConstraintVariable,
override val length: UtModel,
override val elements: Map<UtModel, UtModel>,
override val utConstraints: Set<UtConstraint> = emptySet()
) : UtElementContainerConstraintModel(variable, length, elements, utConstraints)

/**
* Model for complex objects with assemble instructions.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ class ConstraintResolver(
aliases: Set<UtConstraintVariable>
): UtModel = when (concrete.value) {
is ListWrapper -> buildListModel(concrete.value, variable, atoms, aliases)
else -> TODO()
is SetWrapper -> buildSetModel(concrete.value, variable, atoms, aliases)
else -> buildObjectModel(variable, atoms, aliases)
}

private fun buildListModel(
Expand Down Expand Up @@ -334,6 +335,36 @@ class ConstraintResolver(
)
}

private fun buildSetModel(
concrete: SetWrapper,
variable: UtConstraintVariable,
atoms: Set<UtConstraint>,
aliases: Set<UtConstraintVariable>
): UtModel {
val allAliases = aliases + variable
val refConstraints = atoms.filter { constraint ->
allAliases.any { it in constraint }
}.toSet()

val default = { buildObjectModel(variable, atoms, aliases) }
val elementData = atoms
.flatten { it is UtConstraintFieldAccess && it.instance == variable && it.fieldId.name == "elementData" }
.firstOrNull() as? UtConstraintFieldAccess ?: return default()
val storageArray = atoms
.flatten { it is UtConstraintFieldAccess && it.instance == elementData && it.fieldId.name == "storage" }
.firstOrNull() as? UtConstraintFieldAccess ?: return default()
val aliasArrays = aliases.map {
UtConstraintFieldAccess(UtConstraintFieldAccess(it, elementData.fieldId), storageArray.fieldId)
}.toSet()
val array = buildArrayModel(storageArray, atoms, aliasArrays) as UtArrayConstraintModel
return UtSetConstraintModel(
variable,
array.length,
array.elements,
array.utConstraints + refConstraints
)
}

private val UtExpression.variable get() = accept(varBuilder)
private val UtConstraintVariable.expr get() = varBuilder[this]
private val UtConstraintVariable.addr get() = holder.concreteAddr(expr as UtAddrExpression)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,7 @@ class UtVarBuilder(
UtConstraintArrayAccess(base, index, objectClassId)
}

else -> {
System.err.println(base)
System.err.println(base.classId)
System.err.println(index)
System.err.println(index.classId)
index
}
else -> index
}

override fun visit(expr: UtMkArrayExpression): UtConstraintVariable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Resolver(
is ReferenceToUnit -> resolve(synthesisUnitContext[unit.reference])
is ArrayUnit -> unitToModel.getOrPut(unit) { resolveArray(unit) }
is ListUnit -> unitToModel.getOrPut(unit) { resolveList(unit) }
is SetUnit -> unitToModel.getOrPut(unit) { resolveSet(unit) }
}

private fun resolveMethodUnit(unit: MethodUnit): UtModel =
Expand Down Expand Up @@ -77,10 +78,12 @@ class Resolver(
return model
}

private fun resolveList(unit: ListUnit): UtModel {
val elements = unit.elements.associate {
resolve(synthesisUnitContext[it.first]) to resolve(synthesisUnitContext[it.second])
}
private fun resolveCollection(
unit: ElementContainingUnit,
constructorId: ConstructorId,
modificationId: MethodId
): UtModel {
val elements = unit.elements.map { resolve(synthesisUnitContext[it.second]) }

val instantiationChain = mutableListOf<UtStatementModel>()
val modificationChain = mutableListOf<UtStatementModel>()
Expand All @@ -94,20 +97,24 @@ class Resolver(
)

instantiationChain.add(
UtExecutableCallModel(model, unit.constructorId, listOf(), model)
UtExecutableCallModel(model, constructorId, listOf(), model)
)

for ((_, value) in elements) {
for (value in elements) {
modificationChain.add(
UtExecutableCallModel(
model, unit.addId, listOf(value),
model, modificationId, listOf(value),
)
)
}

return model
}

private fun resolveList(unit: ListUnit): UtModel = resolveCollection(unit, unit.constructorId, unit.addId)

private fun resolveSet(unit: SetUnit): UtModel = resolveCollection(unit, unit.constructorId, unit.addId)

private fun resolveArray(unit: ArrayUnit): UtModel {
val lengthModel = resolve(synthesisUnitContext[unit.length]) as UtPrimitiveModel
val elements = unit.elements.associate {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ class SynthesisMethodContext(
}

is ListUnit -> synthesizeConstructorInvoke(unit.constructorId, listOf())

else -> TODO()
is SetUnit -> synthesizeConstructorInvoke(unit.constructorId, listOf())
}

private fun synthesizeSetExpr(
Expand All @@ -158,7 +157,7 @@ class SynthesisMethodContext(

is ListUnit -> synthesizeVirtualInvoke(unit.addId, listOf(unitLocal, value))

else -> TODO()
is SetUnit -> synthesizeVirtualInvoke(unit.addId, listOf(unitLocal, value))
}

private fun synthesizeVirtualInvoke(method: MethodId, parameterLocals: List<JimpleLocal>): JimpleLocal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ data class ListUnit(
}
}

data class SetUnit(
override val classId: ClassId,
override val elements: List<Pair<UtModel, UtModel>>,
override val length: UtModel
) : ElementContainingUnit(classId, elements, length) {
val constructorId get() = classId.allConstructors.first { it.parameters.isEmpty() }
val addId get() = classId.allMethods.first {
it.name == "add" && it.parameters == listOf(objectClassId)
}
}

data class NullUnit(
override val classId: ClassId
) : SynthesisUnit()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ class SynthesisUnitContext(
this.length
)

is UtSetConstraintModel -> SetUnit(
this.classId,
this.elements.toList(),
this.length
)

is UtReferenceToConstraintModel -> ReferenceToUnit(this.classId, this.reference)
else -> error("Only UtSynthesisModel supported")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,26 +404,34 @@ private class UtConstraintBuilder(
}

override fun visitUtLtConstraint(expr: UtLtConstraint): UtBoolExpression = with(expr) {
val lhvVal = lhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val rhvVal = rhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val lhvVal = lhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
val rhvVal = rhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
Lt(lhvVal, rhvVal)
}

override fun visitUtGtConstraint(expr: UtGtConstraint): UtBoolExpression = with(expr) {
val lhvVal = lhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val rhvVal = rhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val lhvVal = lhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
val rhvVal = rhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
Gt(lhvVal, rhvVal)
}

override fun visitUtLeConstraint(expr: UtLeConstraint): UtBoolExpression = with(expr) {
val lhvVal = lhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val rhvVal = rhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val lhvVal = lhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
val rhvVal = rhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
Le(lhvVal, rhvVal)
}

override fun visitUtGeConstraint(expr: UtGeConstraint): UtBoolExpression = with(expr) {
val lhvVal = lhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val rhvVal = rhv.accept(this@UtConstraintBuilder) as PrimitiveValue
val lhvVal = lhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
val rhvVal = rhv.accept(this@UtConstraintBuilder) as? PrimitiveValue
?: error("a")
Ge(lhvVal, rhvVal)
}

Expand Down