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

[IR] Switch forbidden list in ONLY_BUILTINS mode onto allowed one

Browse Source
This commit is contained in:
Ivan Kylchik
2023-04-28 18:12:27 +02:00
committed by Space Team
parent 7747643945
commit 568b593da7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/checker/EvaluationMode.kt
+10 -6
View File
@@ -50,10 +50,14 @@ enum class EvaluationMode(protected val mustCheckBody: Boolean) {
},
ONLY_BUILTINS(mustCheckBody = false) {
private val forbiddenMethodsOnPrimitives = setOf("inc", "dec", "rangeTo", "rangeUntil", "hashCode")
private val forbiddenMethodsOnStrings = setOf(
"subSequence", "hashCode", "<init>",
"chars", "codePoints" // from java.lang.CharSequence; they are represented as member declarations from "kotlin.String"
private val allowedMethodsOnPrimitives = setOf(
"not", "unaryMinus", "unaryPlus", "inv",
"toString", "toChar", "toByte", "toShort", "toInt", "toLong", "toFloat", "toDouble",
"equals", "compareTo", "plus", "minus", "times", "div", "rem", "and", "or", "xor", "shl", "shr", "ushr",
"less", "lessOrEqual", "greater", "greaterOrEqual"
)
private val allowedMethodsOnStrings = setOf(
"<get-length>", "plus", "get", "compareTo", "equals", "toString"
)
private val allowedExtensionFunctions = setOf(
"kotlin.floorDiv", "kotlin.mod", "kotlin.NumbersKt.floorDiv", "kotlin.NumbersKt.mod", "kotlin.<get-code>"
@@ -76,8 +80,8 @@ enum class EvaluationMode(protected val mustCheckBody: Boolean) {
val parentType = parent?.defaultType
return when {
parentType == null -> fqName in allowedExtensionFunctions || fqName in allowedBuiltinExtensionFunctions
parentType.isPrimitiveType() -> function.name.asString() !in forbiddenMethodsOnPrimitives
parentType.isString() -> function.name.asString() !in forbiddenMethodsOnStrings
parentType.isPrimitiveType() -> function.name.asString() in allowedMethodsOnPrimitives
parentType.isString() -> function.name.asString() in allowedMethodsOnStrings
parentType.isAny() -> function.name.asString() == "toString" && context?.dispatchReceiver !is IrGetObjectValue
parent.isObject -> parent.parentClassOrNull?.defaultType?.let { it.isPrimitiveType() || it.isUnsigned() } == true
parentType.isUnsignedType() && function is IrConstructor -> true