From 1252714215e03bdca681e9841475d326cdeef475 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 24 Jan 2020 18:39:23 +0000 Subject: [PATCH] Properly transform (ignore) method descriptors for primitive array types Fixes #383 --- .../asm/mixin/transformer/MixinTargetContext.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index c78022cb..268bc9e5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -911,19 +911,30 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { private String transformSingleDescriptor(String desc, boolean isObject) { Activity descriptorActivity = this.activities.begin("desc=%s", desc); + boolean isArray = false; String type = desc; while (type.startsWith("[") || type.startsWith("L")) { if (type.startsWith("[")) { type = type.substring(1); + isArray = true; continue; } type = type.substring(1, type.indexOf(";")); isObject = true; } + // Primitive types don't need to be transformed if (!isObject) { descriptorActivity.end(); return desc; } + // Primitive arrays are basically Object and don't need to be transformed either + if (isArray && type.length() == 1) { + Type parsedType = Type.getType(type); + if (parsedType.getSort() <= Type.DOUBLE) { + descriptorActivity.end(); + return desc; + } + } String innerClassName = this.innerClasses.get(type); if (innerClassName != null) { descriptorActivity.end();