From 39d748dbbb1cb376b2a43e30782d71000b272d9f Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 18 Mar 2021 11:34:41 +0300 Subject: [PATCH] Native compiler: replace C++ CityHash64 impl by Kotlin one --- .../org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt index 1f3f4aa0fca..cafe946f636 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt @@ -6,15 +6,12 @@ package org.jetbrains.kotlin.backend.konan.llvm import kotlinx.cinterop.* +import org.jetbrains.kotlin.backend.common.serialization.cityHash64 import org.jetbrains.kotlin.backend.konan.hash.* +@OptIn(ExperimentalUnsignedTypes::class) internal fun localHash(data: ByteArray): Long { - memScoped { - val res = alloc() - val bytes = allocArrayOf(data) - MakeLocalHash(bytes, data.size, res.ptr) - return res.value - } + return cityHash64(data).toLong() } internal fun globalHash(data: ByteArray, retValPlacement: NativePlacement): GlobalHash {