From 4084fa3eb9b6dd4003e108ff47efe56b06aa7ff1 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 19 Mar 2024 22:03:01 +0000 Subject: [PATCH] Add classname to stracktrace when Kotlin remapping fails. Closes #1045 --- .../kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt index 074fe2c0..545ccd25 100644 --- a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt +++ b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt @@ -57,7 +57,11 @@ class KotlinMetadataRemappingClassVisitor(private val remapper: Remapper, next: var result: AnnotationVisitor? = super.visitAnnotation(descriptor, visible) if (descriptor == ANNOTATION_DESCRIPTOR && result != null) { - result = KotlinClassMetadataRemappingAnnotationVisitor(remapper, result, className) + try { + result = KotlinClassMetadataRemappingAnnotationVisitor(remapper, result, className) + } catch (e: Exception) { + throw RuntimeException("Failed to remap Kotlin metadata annotation in class $className", e) + } } return result