azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix VerifyError on android with 'inv' operation on Byte and Short

Browse Source
This commit is contained in:
Mikhael Bogdanov
2016-11-15 12:20:07 +01:00
parent 5b44343d15
commit 63fed20249
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Inv.kt
+5 -3
View File
@@ -19,19 +19,21 @@ package org.jetbrains.kotlin.codegen.intrinsics
import org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType import org.jetbrains.kotlin.codegen.AsmUtil.numberFunctionOperandType
import org.jetbrains.kotlin.codegen.Callable import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.CallableMethod import org.jetbrains.kotlin.codegen.CallableMethod
import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
class Inv : IntrinsicMethod() { class Inv : IntrinsicMethod() {
override fun toCallable(method: CallableMethod): Callable { override fun toCallable(method: CallableMethod): Callable {
val type = numberFunctionOperandType(method.returnType) val intermediateResultType = numberFunctionOperandType(method.returnType)
return createUnaryIntrinsicCallable(method, newThisType = type) { return createUnaryIntrinsicCallable(method) {
if (returnType == Type.LONG_TYPE) { if (returnType == Type.LONG_TYPE) {
it.lconst(-1) it.lconst(-1)
} }
else { else {
it.iconst(-1) it.iconst(-1)
} }
it.xor(returnType) it.xor(intermediateResultType)
StackValue.coerce(intermediateResultType, returnType, it)
} }
} }
} }