Use setOf for singleton sets, use hash maps in EtsHierarchy (#321)

Lipen · web-flow · commit 5efe4bec3dad · 2025-08-06T16:14:14.000+03:00
diff --git a/usvm-ts/src/main/kotlin/org/usvm/util/EtsHierarchy.kt b/usvm-ts/src/main/kotlin/org/usvm/util/EtsHierarchy.kt
@@ -22,7 +22,9 @@ class EtsHierarchy(private val scene: EtsScene) {
                 classes
                     .groupBy { it.signature }
                     .mapValues { it.value.single() }
+                    .let { HashMap(it) }
             }
+            .let { HashMap(it) }
     }
 
     private val ancestors: Map<EtsClass, Set<EtsClass>> by lazy {
@@ -111,7 +113,7 @@ class EtsHierarchy(private val scene: EtsScene) {
 
         if (etsClassType.isResolved()) {
             val signature = (etsClassType as EtsClassType).signature.copy(name = typeName)
-            return suitableClasses[signature]?.let { hashSetOf(it) } ?: emptySet()
+            return suitableClasses[signature]?.let { setOf(it) } ?: emptySet()
         }
 
         return suitableClasses.values

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ class EtsHierarchy(private val scene: EtsScene) {`
`22`	`22`	`classes`
`23`	`23`	`.groupBy { it.signature }`
`24`	`24`	`.mapValues { it.value.single() }`
	`25`	`+ .let { HashMap(it) }`
`25`	`26`	`}`
	`27`	`+ .let { HashMap(it) }`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`private val ancestors: Map<EtsClass, Set<EtsClass>> by lazy {`
`@@ -111,7 +113,7 @@ class EtsHierarchy(private val scene: EtsScene) {`
`111`	`113`
`112`	`114`	`if (etsClassType.isResolved()) {`
`113`	`115`	`val signature = (etsClassType as EtsClassType).signature.copy(name = typeName)`
`114`		`- return suitableClasses[signature]?.let { hashSetOf(it) } ?: emptySet()`
	`116`	`+ return suitableClasses[signature]?.let { setOf(it) } ?: emptySet()`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`return suitableClasses.values`