Skip to content

String concat transformer #214

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.

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

Merged
merged 3 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion usvm-jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ val samples by sourceSets.creating {
}
}

val `samples-jdk11` by sourceSets.creating {
java {
srcDir("src/samples-jdk11/java")
}
}

val `sample-approximations` by sourceSets.creating {
java {
srcDir("src/sample-approximations/java")
Expand Down Expand Up @@ -92,9 +98,20 @@ val `usvm-api-jar` = tasks.register<Jar>("usvm-api-jar") {
val testSamples by configurations.creating
val testSamplesWithApproximations by configurations.creating

val compileSamplesJdk11 = tasks.register<JavaCompile>("compileSamplesJdk11") {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()

source = `samples-jdk11`.java
classpath = `samples-jdk11`.compileClasspath
options.sourcepath = `samples-jdk11`.java
destinationDirectory = `samples-jdk11`.java.destinationDirectory
}

dependencies {
testSamples(samples.output)
testSamples(`usvm-api`.output)
testSamples(files(`samples-jdk11`.java.destinationDirectory))

testSamplesWithApproximations(samples.output)
testSamplesWithApproximations(`usvm-api`.output)
Expand All @@ -104,7 +121,7 @@ dependencies {

tasks.withType<Test> {
dependsOn(`usvm-api-jar`)
dependsOn(testSamples, testSamplesWithApproximations)
dependsOn(compileSamplesJdk11, testSamples, testSamplesWithApproximations)

val usvmApiJarPath = `usvm-api-jar`.get().outputs.files.singleFile
val usvmApproximationJarPath = approximations.resolvedConfiguration.files.single()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ import org.usvm.machine.interpreter.statics.JcStaticFieldRegionId
import org.usvm.machine.interpreter.statics.JcStaticFieldsMemoryRegion
import org.usvm.machine.interpreter.statics.isInitialized
import org.usvm.machine.interpreter.statics.markAsInitialized
import org.usvm.machine.interpreter.transformers.JcMultiDimArrayAllocationTransformer
import org.usvm.machine.interpreter.transformers.JcStringConcatTransformer
import org.usvm.machine.logger
import org.usvm.machine.operator.JcBinaryOperator
import org.usvm.machine.operator.JcUnaryOperator
import org.usvm.machine.operator.ensureBvExpr
Expand Down Expand Up @@ -408,7 +411,11 @@ class JcExprResolver(
}

override fun visitJcDynamicCallExpr(expr: JcDynamicCallExpr): UExpr<out USort>? =
resolveInvoke(
apply {
if (JcStringConcatTransformer.methodIsStringConcat(expr.method.method)) {
logger.warn { "JcStringConcatTransformer should be used to process string concatenation" }
}
}.resolveInvoke(
expr.method,
instanceExpr = null,
argumentExprs = { expr.callSiteArgs },
Expand Down

This file was deleted.

Loading
Loading