From e9fc30c99526ee2de425fb55b741e5c56d291f70 Mon Sep 17 00:00:00 2001 From: dajiaohuang Date: Sun, 4 Oct 2026 10:40:22 +0800 Subject: [PATCH] Track throwable causes by identity --- .../kmp/nsexceptionkt/core/Throwable.kt | 11 +++++----- .../core/ThrowableCausesTests.kt | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/nsexception-kt-core/src/commonMain/kotlin/com/rickclephas/kmp/nsexceptionkt/core/Throwable.kt b/nsexception-kt-core/src/commonMain/kotlin/com/rickclephas/kmp/nsexceptionkt/core/Throwable.kt index 0ac8269..3ee03ab 100644 --- a/nsexception-kt-core/src/commonMain/kotlin/com/rickclephas/kmp/nsexceptionkt/core/Throwable.kt +++ b/nsexception-kt-core/src/commonMain/kotlin/com/rickclephas/kmp/nsexceptionkt/core/Throwable.kt @@ -8,11 +8,12 @@ import kotlin.experimental.ExperimentalNativeApi * This function stops once a reference cycles is detected. */ internal val Throwable.causes: List get() = buildList { - val causes = mutableSetOf() - var cause = cause - while (cause != null && causes.add(cause)) { - add(cause) - cause = cause.cause + var nextCause = cause + while (nextCause != null) { + val currentCause = nextCause + if (any { it === currentCause }) break + add(currentCause) + nextCause = currentCause.cause } } diff --git a/nsexception-kt-core/src/commonTest/kotlin/com/rickclephas/kmp/nsexceptionkt/core/ThrowableCausesTests.kt b/nsexception-kt-core/src/commonTest/kotlin/com/rickclephas/kmp/nsexceptionkt/core/ThrowableCausesTests.kt index dc13129..92e537b 100644 --- a/nsexception-kt-core/src/commonTest/kotlin/com/rickclephas/kmp/nsexceptionkt/core/ThrowableCausesTests.kt +++ b/nsexception-kt-core/src/commonTest/kotlin/com/rickclephas/kmp/nsexceptionkt/core/ThrowableCausesTests.kt @@ -3,6 +3,7 @@ package com.rickclephas.kmp.nsexceptionkt.core import kotlin.experimental.ExperimentalNativeApi import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertSame @OptIn(ExperimentalNativeApi::class) class ThrowableCausesTests { @@ -31,6 +32,14 @@ class ThrowableCausesTests { override var cause: Throwable? = null } + private class EqualThrowable(override val message: String?) : Throwable() { + override var cause: Throwable? = null + + override fun equals(other: Any?): Boolean = other is EqualThrowable + + override fun hashCode(): Int = 0 + } + @Test fun testReferenceCycle() { val cause = MyThrowable("Cause throwable") @@ -38,4 +47,17 @@ class ThrowableCausesTests { cause.cause = throwable assertEquals(listOf(cause, throwable), throwable.causes) } + + @Test + fun testEqualButDistinctCauses() { + val cause1 = EqualThrowable("Cause 1") + val cause2 = EqualThrowable("Cause 2") + cause1.cause = cause2 + val throwable = Throwable("Test throwable", cause1) + + val causes = throwable.causes + assertEquals(2, causes.size) + assertSame(cause1, causes[0]) + assertSame(cause2, causes[1]) + } }