Skip to content

Fix simplification getting rid of variable type #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leventeBajczi wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −8
Open

Fix simplification getting rid of variable type #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ buildscript {

allprojects {
group = "hu.bme.mit.theta"
version = "6.27.14"
version = "6.27.15"

apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
}
Expand Down
26 changes: 19 additions & 7 deletions subprojects/xcfa/xcfa/src/main/java/hu/bme/mit/theta/xcfa/utils/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import hu.bme.mit.theta.core.stmt.Stmts.Assign
import hu.bme.mit.theta.core.stmt.Stmts.Assume
import hu.bme.mit.theta.core.type.Expr
import hu.bme.mit.theta.core.type.Type
import hu.bme.mit.theta.core.type.abstracttype.AbstractExprs.Pos
import hu.bme.mit.theta.core.type.abstracttype.NeqExpr
import hu.bme.mit.theta.core.type.anytype.Dereference
import hu.bme.mit.theta.core.type.anytype.RefExpr
Expand Down Expand Up @@ -147,13 +148,8 @@ fun XcfaLabel.simplify(valuation: MutableValuation, parseContext: ParseContext):

is AssignStmt<*> -> {
simplified as AssignStmt<*>
if (parseContext.metadata.getMetadataValue(stmt.expr, "cType").isPresent)
parseContext.metadata.create(
simplified.expr,
"cType",
CComplexType.getType(stmt.expr, parseContext),
)
StmtLabel(simplified, metadata = metadata)
val expr = simplified.expr.withMetadata(parseContext, stmt.expr)
AssignStmtLabel(simplified.varDecl, expr, metadata = metadata)
}

is AssumeStmt -> {
Expand All @@ -173,6 +169,22 @@ fun XcfaLabel.simplify(valuation: MutableValuation, parseContext: ParseContext):
}
} else this

private fun <T : Type> Expr<T>.withMetadata(
parseContext: ParseContext,
metadataSource: Expr<*>,
): Expr<T> {
val oldType = parseContext.metadata.getMetadataValue(this, "cType")
if (oldType.isPresent) {
val type = CComplexType.getType(metadataSource, parseContext)
if (type != oldType.get()) {
val newExpr = Pos(this)
parseContext.metadata.create(newExpr, "cType", type)
return newExpr as Expr<T>
}
}
return this
}

/**
* Returns the set of edges that are before any thread start in the init procedure or after all
* thread joins in the init procedure (when it is guaranteed that no other thread is running).
Expand Down