Skip to content

Commit 63fb14c

Browse files
committed
Test fixes
1 parent 57e207e commit 63fb14c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

usvm-jvm/src/main/kotlin/org/usvm/machine/interpreter/transformers/JcSingleInstructionTransformer.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@ class JcSingleInstructionTransformer(originalInstructions: JcInstList<JcInst>) {
9999
}
100100
}
101101

102+
@OptIn(ExperimentalContracts::class)
102103
inline fun MutableList<JcInst>.addInstruction(origin: JcInstLocation, body: (JcInstLocation) -> JcInst) {
104+
contract {
105+
callsInPlace(body, InvocationKind.EXACTLY_ONCE)
106+
}
107+
103108
val index = size
104109
val newLocation = JcInstLocationImpl(origin.method, index, origin.lineNumber)
105110
val instruction = body(newLocation)

usvm-jvm/src/test/kotlin/org/usvm/samples/collections/QueueUsagesTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class QueueUsagesTest : JavaMethodTestRunner() {
9090
eq(4),
9191
{ _, q, r -> q == null && r == 0 },
9292
{ _, q, r -> q is LinkedList<*> && r == 1 },
93-
{ _, q, r -> q is ArrayDeque<*> && r == 2 },
94-
{ _, q, r -> q !is LinkedList<*> && q !is ArrayDeque<*> && r == 3 }
93+
{ _, q, r -> q is java.util.ArrayDeque<*> && r == 2 },
94+
{ _, q, r -> q !is LinkedList<*> && q !is java.util.ArrayDeque<*> && r == 3 }
9595
)
9696
}
9797

@@ -102,8 +102,8 @@ class QueueUsagesTest : JavaMethodTestRunner() {
102102
eq(4),
103103
{ _, q, r -> q == null && r == 0 },
104104
{ _, q, r -> q is LinkedList<*> && r == 1 },
105-
{ _, q, r -> q is ArrayDeque<*> && r == 2 },
106-
{ _, q, r -> q !is LinkedList<*> && q !is ArrayDeque<*> && r == 3 } // this is uncovered
105+
{ _, q, r -> q is java.util.ArrayDeque<*> && r == 2 },
106+
{ _, q, r -> q !is LinkedList<*> && q !is java.util.ArrayDeque<*> && r == 3 } // this is uncovered
107107
)
108108
}
109109

0 commit comments

Comments
 (0)