hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-20 10:46:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve code quality

Browse Source
This commit is contained in:
Tamas Vajk
2021-12-02 09:36:15 +01:00
committed by Ian Lynagh
parent 16ba27c476
commit 27f58f2929
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -314,14 +314,18 @@ open class KotlinFileExtractor(
}
}
fun extractFunction(f: IrFunction, parentId: Label<out DbReftype>, label: Label<DbMethod>? = null): Label<out DbCallable> {
fun extractFunction(f: IrFunction, parentId: Label<out DbReftype>): Label<out DbCallable> {
currentFunction = f
f.typeParameters.map { extractTypeParameter(it) }
val locId = tw.getLocation(f)
val id = label ?: useFunction<DbCallable>(f)
val id =
if (f.isLocalFunction())
withSourceFile(f.fileOrNull!!).getLocalFunctionLabels(f).function
else
useFunction<DbCallable>(f)
val extReceiver = f.extensionReceiverParameter
val idxOffset = if (extReceiver != null) 1 else 0
@@ -680,7 +684,7 @@ open class KotlinFileExtractor(
}
if (callTarget.isLocalFunction()) {
val ids = withSourceFile(callTarget.fileOrNull!!).useGeneratedLocalFunctionClass(callTarget)
val ids = withSourceFile(callTarget.fileOrNull!!).getLocalFunctionLabels(callTarget)
val methodId = ids.function
tw.writeCallableBinding(id, methodId)

7
java/kotlin-extractor/src/main/kotlin/KotlinSourceFileExtractor.kt
View File

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
import org.jetbrains.kotlin.ir.types.IrSimpleType
import org.jetbrains.kotlin.ir.types.IrType
import org.jetbrains.kotlin.ir.types.classOrNull
import org.jetbrains.kotlin.ir.util.fileOrNull
import org.jetbrains.kotlin.ir.util.packageFqName
import org.jetbrains.kotlin.ir.util.IdSignature
@@ -108,7 +107,7 @@ class KotlinSourceFileExtractor(
data class LocalFunctionLabels(val type: TypeResults, val constructor: Label<DbConstructor>, val function: Label<DbMethod>)
fun useGeneratedLocalFunctionClass(f: IrFunction): LocalFunctionLabels {
fun getLocalFunctionLabels(f: IrFunction): LocalFunctionLabels {
if (!f.isLocalFunction()){
logger.warnElement(Severity.ErrorSevere, "Extracting a non-local function as a local one", f)
}
@@ -129,7 +128,7 @@ class KotlinSourceFileExtractor(
}
fun extractGeneratedClass(localFunction: IrFunction, superTypes: List<IrType>) : Label<out DbClass> {
val ids = withSourceFile(localFunction.fileOrNull!!).useGeneratedLocalFunctionClass(localFunction)
val ids = getLocalFunctionLabels(localFunction)
// Write class
@Suppress("UNCHECKED_CAST")
@@ -140,7 +139,7 @@ class KotlinSourceFileExtractor(
tw.writeHasLocation(id, locId)
// Extract local function as a member
extractFunction(localFunction, id, ids.function)
extractFunction(localFunction, id)
// Extract constructor
tw.writeConstrs(ids.constructor, "", "", ids.type.javaResult.id, ids.type.kotlinResult.id, id, ids.constructor)

5
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -445,12 +445,13 @@ class X {
}
protected fun IrFunction.isLocalFunction(): Boolean {
return this.visibility == DescriptorVisibilities.LOCAL
return this.visibility == DescriptorVisibilities.LOCAL &&
this.origin != IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA
}
fun <T: DbCallable> useFunction(f: IrFunction): Label<out T> {
if (f.isLocalFunction()) {
val ids = withSourceFile(f.fileOrNull!!).useGeneratedLocalFunctionClass(f)
val ids = withSourceFile(f.fileOrNull!!).getLocalFunctionLabels(f)
@Suppress("UNCHECKED_CAST")
return ids.function as Label<out T>
}