@@ -124,7 +124,7 @@ data class Memory( // TODO: split purely symbolic memory and information about s
124
124
private val concrete : PersistentMap <UtAddrExpression , Concrete > = persistentHashMapOf(),
125
125
private val mockInfos : PersistentList <MockInfoEnriched > = persistentListOf(),
126
126
private val staticInstanceStorage : PersistentMap <ClassId , ObjectValue > = persistentHashMapOf(),
127
- private val initializedStaticFields : PersistentMap <FieldId , Any ? > = persistentHashMapOf (),
127
+ private val initializedStaticFields : PersistentSet <FieldId > = persistentHashSetOf (),
128
128
private val staticFieldsStates : PersistentMap <FieldId , FieldStates > = persistentHashMapOf(),
129
129
private val meaningfulStaticFields : PersistentSet <FieldId > = persistentHashSetOf(),
130
130
private val addrToArrayType : PersistentMap <UtAddrExpression , ArrayType > = persistentHashMapOf(),
@@ -290,7 +290,7 @@ data class Memory( // TODO: split purely symbolic memory and information about s
290
290
concrete = concrete.putAll(update.concrete),
291
291
mockInfos = mockInfos.mergeWithUpdate(update.mockInfos),
292
292
staticInstanceStorage = staticInstanceStorage.putAll(update.staticInstanceStorage),
293
- initializedStaticFields = initializedStaticFields.putAll (update.initializedStaticFields),
293
+ initializedStaticFields = initializedStaticFields.addAll (update.initializedStaticFields),
294
294
staticFieldsStates = previousMemoryStates.toPersistentMap().putAll(updatedStaticFields),
295
295
meaningfulStaticFields = meaningfulStaticFields.addAll(update.meaningfulStaticFields),
296
296
addrToArrayType = addrToArrayType.putAll(update.addrToArrayType),
@@ -963,7 +963,7 @@ data class MemoryUpdate(
963
963
val concrete : PersistentMap <UtAddrExpression , Concrete > = persistentHashMapOf(),
964
964
val mockInfos : PersistentList <MockInfoEnriched > = persistentListOf(),
965
965
val staticInstanceStorage : PersistentMap <ClassId , ObjectValue > = persistentHashMapOf(),
966
- val initializedStaticFields : PersistentMap <FieldId , Any ? > = persistentHashMapOf (),
966
+ val initializedStaticFields : PersistentSet <FieldId > = persistentHashSetOf (),
967
967
val staticFieldsUpdates : PersistentList <StaticFieldMemoryUpdateInfo > = persistentListOf(),
968
968
val meaningfulStaticFields : PersistentSet <FieldId > = persistentHashSetOf(),
969
969
val addrToArrayType : PersistentMap <UtAddrExpression , ArrayType > = persistentHashMapOf(),
@@ -982,7 +982,7 @@ data class MemoryUpdate(
982
982
concrete = concrete.putAll(other.concrete),
983
983
mockInfos = mockInfos.mergeWithUpdate(other.mockInfos),
984
984
staticInstanceStorage = staticInstanceStorage.putAll(other.staticInstanceStorage),
985
- initializedStaticFields = initializedStaticFields.putAll (other.initializedStaticFields),
985
+ initializedStaticFields = initializedStaticFields.addAll (other.initializedStaticFields),
986
986
staticFieldsUpdates = staticFieldsUpdates.addAll(other.staticFieldsUpdates),
987
987
meaningfulStaticFields = meaningfulStaticFields.addAll(other.meaningfulStaticFields),
988
988
addrToArrayType = addrToArrayType.putAll(other.addrToArrayType),
0 commit comments