azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent init order issues in maps (#517)

Browse Source
This commit is contained in:
Nikolay Igotti
2017-04-21 16:02:11 +03:00
committed by GitHub
parent 509965a691
commit be646930cc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/kotlin/collections/Maps.kt
+4 -3
View File
@@ -110,13 +110,14 @@ internal fun mapCapacity(expectedSize: Int): Int {
if (expectedSize < 3) { if (expectedSize < 3) {
return expectedSize + 1 return expectedSize + 1
} }
if (expectedSize < INT_MAX_POWER_OF_TWO) { if (expectedSize < 0x40000000 /* INT_MAX_POWER_OF_TWO */) {
return expectedSize + expectedSize / 3 return expectedSize + expectedSize / 3
} }
return Int.MAX_VALUE // any large value return 0x7fffffff // any large value
} }
private const val INT_MAX_POWER_OF_TWO: Int = Int.MAX_VALUE / 2 + 1 // Using global constant with dependency like that introduces weird init order dependencies.
// private const val INT_MAX_POWER_OF_TWO: Int = Int.MAX_VALUE / 2 + 1
/** Returns `true` if this map is not empty. */ /** Returns `true` if this map is not empty. */
@kotlin.internal.InlineOnly @kotlin.internal.InlineOnly