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

Improve exception message in collection stubs

Browse Source
This commit is contained in:
Denis Zharkov
2016-10-05 14:15:17 +03:00
parent 8ee568105c
commit 3a100d4139
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
+4 -1
View File
@@ -323,7 +323,10 @@ class CollectionStubMethodGenerator(
val genericSignature = if (synthetic) null else signature.genericsSignature val genericSignature = if (synthetic) null else signature.genericsSignature
val mv = v.newMethod(JvmDeclarationOrigin.NO_ORIGIN, access, asmMethod.name, asmMethod.descriptor, genericSignature, null) val mv = v.newMethod(JvmDeclarationOrigin.NO_ORIGIN, access, asmMethod.name, asmMethod.descriptor, genericSignature, null)
mv.visitCode() mv.visitCode()
AsmUtil.genThrow(InstructionAdapter(mv), "java/lang/UnsupportedOperationException", "Mutating immutable collection") AsmUtil.genThrow(
InstructionAdapter(mv),
"java/lang/UnsupportedOperationException",
"Operation is not supported for read-only collection")
FunctionCodegen.endVisit(mv, "built-in stub for $signature", null) FunctionCodegen.endVisit(mv, "built-in stub for $signature", null)
} }
} }
compiler/testData/codegen/box/builtinStubMethods/immutableRemove.kt
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ fun box(): String {
method.invoke(c, "") method.invoke(c, "")
return "fail 4" return "fail 4"
} catch (e: java.lang.reflect.InvocationTargetException) { } catch (e: java.lang.reflect.InvocationTargetException) {
if (e.cause!!.message != "Mutating immutable collection") return "fail 5: ${e.cause!!.message}" if (e.cause!!.message != "Operation is not supported for read-only collection") return "fail 5: ${e.cause!!.message}"
} }
return "OK" return "OK"