User: joe Date: 16 Nov 25 11:12 Revision: 41b031fd88937cfcd10c740b9c777c013ae48d7e Summary: Properly fix #2543 TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10299&personal=false Index: src/main/kotlin/platform/mixin/handlers/mixinextras/ModifyExpressionValueHandler.kt =================================================================== --- src/main/kotlin/platform/mixin/handlers/mixinextras/ModifyExpressionValueHandler.kt (revision c0212c27e77987bed9edc5cfb03b17cc5519519c) +++ src/main/kotlin/platform/mixin/handlers/mixinextras/ModifyExpressionValueHandler.kt (revision 41b031fd88937cfcd10c740b9c777c013ae48d7e) @@ -46,12 +46,14 @@ return false } - // TODO: fix this to make it more accurate -// val returnType = getInsnReturnType(insn) ?: return false -// return returnType != Type.VOID_TYPE + if (decorations[ExpressionDecorations.SIMPLE_EXPRESSION_TYPE] != null) { - return true - } + return true + } + val returnType = getInsnReturnType(insn) ?: return false + return returnType != Type.VOID_TYPE + } + override val allowedInsnDescription = "instructions that return a value" override fun expectedMethodSignature(