Skip to content

Commit 02734be

Browse files
committed
Kotlin: Fix building with 2.0.255 snapshots
A couple of extension functions were moved
1 parent 9bc0167 commit 02734be

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.github.codeql.utils.*
66
import com.github.codeql.utils.versions.*
77
import com.semmle.extractor.java.OdasaOutput
88
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
9-
import org.jetbrains.kotlin.backend.common.lower.parents
109
import org.jetbrains.kotlin.backend.common.pop
1110
import org.jetbrains.kotlin.builtins.functions.BuiltInFunctionArity
1211
import org.jetbrains.kotlin.config.JvmAnalysisFlags
@@ -43,6 +42,7 @@ import org.jetbrains.kotlin.ir.util.isSuspendFunctionOrKFunction
4342
import org.jetbrains.kotlin.ir.util.isVararg
4443
import org.jetbrains.kotlin.ir.util.kotlinFqName
4544
import org.jetbrains.kotlin.ir.util.packageFqName
45+
import org.jetbrains.kotlin.ir.util.parents
4646
import org.jetbrains.kotlin.ir.util.parentAsClass
4747
import org.jetbrains.kotlin.ir.util.parentClassOrNull
4848
import org.jetbrains.kotlin.ir.util.primaryConstructor

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import com.github.codeql.utils.versions.*
55
import com.semmle.extractor.java.OdasaOutput
66
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
77
import org.jetbrains.kotlin.backend.common.ir.*
8-
import org.jetbrains.kotlin.backend.common.lower.parents
9-
import org.jetbrains.kotlin.backend.common.lower.parentsWithSelf
108
import org.jetbrains.kotlin.backend.jvm.ir.propertyIfAccessor
119
import org.jetbrains.kotlin.codegen.JvmCodegenUtil
1210
import org.jetbrains.kotlin.descriptors.*

java/kotlin-extractor/src/main/kotlin/utils/TypeSubstitution.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.github.codeql.getJavaEquivalentClassId
66
import com.github.codeql.utils.versions.codeQlWithHasQuestionMark
77
import com.github.codeql.utils.versions.createImplicitParameterDeclarationWithWrappedDescriptor
88
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
9-
import org.jetbrains.kotlin.backend.common.lower.parents
109
import org.jetbrains.kotlin.descriptors.ClassKind
1110
import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
1211
import org.jetbrains.kotlin.ir.builders.declarations.buildClass
@@ -27,6 +26,7 @@ import org.jetbrains.kotlin.ir.util.classId
2726
import org.jetbrains.kotlin.ir.util.constructedClassType
2827
import org.jetbrains.kotlin.ir.util.constructors
2928
import org.jetbrains.kotlin.ir.util.kotlinFqName
29+
import org.jetbrains.kotlin.ir.util.parents
3030
import org.jetbrains.kotlin.name.FqName
3131
import org.jetbrains.kotlin.name.Name
3232
import org.jetbrains.kotlin.types.Variance
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
package org.jetbrains.kotlin.ir.util
3+
4+
import org.jetbrains.kotlin.backend.common.lower.parents as kParents
5+
import org.jetbrains.kotlin.backend.common.lower.parentsWithSelf as kParentsWithSelf
6+
import org.jetbrains.kotlin.ir.declarations.*
7+
8+
val IrDeclaration.parents: Sequence<IrDeclarationParent>
9+
get() = this.kParents
10+
11+
val IrDeclaration.parentsWithSelf: Sequence<IrDeclarationParent>
12+
get() = this.kParentsWithSelf
13+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Nothing to do

0 commit comments

Comments
 (0)