From 9df9d3ad03eeb38cf0b6e339d37bc08b11d47cf6 Mon Sep 17 00:00:00 2001 From: Tamas Vajk Date: Mon, 23 May 2022 12:06:29 +0200 Subject: [PATCH] Kotlin: Add 1.5.10 specific files --- .../utils/versions/v_1_5_10/Descriptors.kt | 17 +++++++++++++++ .../utils/versions/v_1_5_10/FileEntry.kt | 5 +++++ .../utils/versions/v_1_5_10/Functions.kt | 8 +++++++ .../kotlin/utils/versions/v_1_5_10/Psi2Ir.kt | 21 +++++++++++++++++++ .../kotlin/utils/versions/v_1_5_10/Types.kt | 7 +++++++ 5 files changed, 58 insertions(+) create mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Descriptors.kt create mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/FileEntry.kt create mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Functions.kt create mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Psi2Ir.kt create mode 100644 java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Types.kt diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Descriptors.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Descriptors.kt new file mode 100644 index 00000000000..d2a3de0b2c4 --- /dev/null +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Descriptors.kt @@ -0,0 +1,17 @@ +package com.github.codeql.utils.versions + +import com.github.codeql.KotlinUsesExtractor +import com.github.codeql.Severity +import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI +import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator +import org.jetbrains.kotlin.ir.util.SymbolTable + +@OptIn(ObsoleteDescriptorBasedAPI::class) +fun KotlinUsesExtractor.getIrStubFromDescriptor(generateStub: (DeclarationStubGenerator) -> TIrStub) : TIrStub? = + (pluginContext.symbolTable as? SymbolTable) ?.let { + val stubGenerator = DeclarationStubGenerator(pluginContext.moduleDescriptor, it, pluginContext.languageVersionSettings) + generateStub(stubGenerator) + } ?: run { + logger.error("Plugin context has no symbol table, couldn't get IR stub") + null + } diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/FileEntry.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/FileEntry.kt new file mode 100644 index 00000000000..cdefc93f18f --- /dev/null +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/FileEntry.kt @@ -0,0 +1,5 @@ +package com.github.codeql.utils.versions + +import org.jetbrains.kotlin.ir.SourceManager + +typealias FileEntry = SourceManager.FileEntry \ No newline at end of file diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Functions.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Functions.kt new file mode 100644 index 00000000000..2fd45e905d9 --- /dev/null +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Functions.kt @@ -0,0 +1,8 @@ +package com.github.codeql.utils.versions + +import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext +import org.jetbrains.kotlin.ir.declarations.IrClass + +fun functionN(pluginContext: IrPluginContext): (Int) -> IrClass { + return { i -> pluginContext.irBuiltIns.functionFactory.functionN(i) } +} diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Psi2Ir.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Psi2Ir.kt new file mode 100644 index 00000000000..16ee288d05a --- /dev/null +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Psi2Ir.kt @@ -0,0 +1,21 @@ +package com.github.codeql.utils.versions + +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.ir.IrElement +import org.jetbrains.kotlin.ir.declarations.IrFile +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi2ir.PsiSourceManager + +class Psi2Ir : Psi2IrFacade { + companion object { + val psiManager = PsiSourceManager() + } + + override fun getKtFile(irFile: IrFile): KtFile? { + return psiManager.getKtFile(irFile) + } + + override fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement? { + return psiManager.findPsiElement(irElement, irFile) + } +} \ No newline at end of file diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Types.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Types.kt new file mode 100644 index 00000000000..15a64232e37 --- /dev/null +++ b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_10/Types.kt @@ -0,0 +1,7 @@ +package com.github.codeql.utils.versions + +import org.jetbrains.kotlin.backend.jvm.codegen.isRawType +import org.jetbrains.kotlin.ir.types.IrSimpleType + + +fun IrSimpleType.isRawType() = this.isRawType() \ No newline at end of file