hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework parent lookup in isUnspecialised

Browse Source
This commit is contained in:
Tamas Vajk
2022-05-16 14:57:06 +02:00
parent 8ebdaf1fc2
commit d4cf877259
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt
View File

@@ -4,11 +4,11 @@ import com.github.codeql.KotlinUsesExtractor
import com.github.codeql.getJavaEquivalentClassId import com.github.codeql.getJavaEquivalentClassId
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
import org.jetbrains.kotlin.backend.common.lower.parents
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.ir.builders.declarations.addConstructor import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
import org.jetbrains.kotlin.ir.builders.declarations.buildClass import org.jetbrains.kotlin.ir.builders.declarations.buildClass
import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrField
import org.jetbrains.kotlin.ir.declarations.IrTypeParameter import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
fun IrType.substituteTypeArguments(params: List<IrTypeParameter>, arguments: List<IrTypeArgument>) = fun IrType.substituteTypeArguments(params: List<IrTypeParameter>, arguments: List<IrTypeArgument>) =
when(this) { when(this) {
@@ -221,17 +222,12 @@ fun isUnspecialised(paramsContainer: IrTypeParametersContainer, args: List<IrTyp
} }
val remainingArgs = args.drop(paramsContainer.typeParameters.size) val remainingArgs = args.drop(paramsContainer.typeParameters.size)
val fieldParent = paramsContainer.parent as? IrField val parentClass = paramsContainer.parents.firstIsInstanceOrNull<IrClass>()
val parent = if (fieldParent != null)
fieldParent.parent as? IrTypeParametersContainer
else
paramsContainer.parent as? IrTypeParametersContainer
val parentUnspecialised = when { val parentUnspecialised = when {
remainingArgs.isEmpty() -> true remainingArgs.isEmpty() -> true
parent == null -> false parentClass == null -> false
parent !is IrClass -> false else -> isUnspecialised(parentClass, remainingArgs)
else -> isUnspecialised(parent as IrClass, remainingArgs)
} }
return unspecialisedHere && parentUnspecialised return unspecialisedHere && parentUnspecialised
} }