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

Simplify getting class file path for functions from current module

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-09-04 15:04:08 +03:00
parent 08a11b627c
commit ed5dcf2182
4 changed files with 12 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
-3
View File
@@ -755,9 +755,6 @@ public class InlineCodegen extends CallGenerator {
IncrementalCache incrementalCache = incrementalCompilationComponents.getIncrementalCache(target);
String sourceFile = getClassFilePath(sourceDescriptor, incrementalCache);
String targetFile = getSourceFilePath(targetDescriptor);
assert sourceFile != null: "No source file for inline fun: " + jvmSignature;
assert targetFile != null: "No target file for inline fun: " + jvmSignature;
InlineRegistering inlineRegistering = incrementalCache.getInlineRegistering();
inlineRegistering.registerInline(sourceFile, jvmSignature.toString(), targetFile);
}
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt
+12 -14
View File
@@ -20,34 +20,32 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass
import org.jetbrains.kotlin.load.kotlin.incremental.FileSourceElement
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.resolve.source.PsiSourceElement
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
public val FunctionDescriptor.sourceFilePath: String?
public val FunctionDescriptor.sourceFilePath: String
get() {
val source = source as? PsiSourceElement
val containingFile = source?.psi?.containingFile
return containingFile?.virtualFile?.canonicalPath
val source = source as PsiSourceElement
val containingFile = source.psi?.containingFile
return containingFile?.virtualFile?.canonicalPath!!
}
public fun FunctionDescriptor.getClassFilePath(cache: IncrementalCache): String? {
public fun FunctionDescriptor.getClassFilePath(cache: IncrementalCache): String {
val container = containingDeclaration as? DeclarationDescriptorWithSource
val source = container?.source
return when (source) {
is FileSourceElement ->
source.file.canonicalPath
is KotlinJvmBinarySourceElement -> {
val kotlinClass = source.binaryClass as? VirtualFileKotlinClass
kotlinClass?.file?.canonicalPath
assert(this is DeserializedSimpleFunctionDescriptor) { "Expected DeserializedSimpleFunctionDescriptor, got: $this" }
val kotlinClass = source.binaryClass as VirtualFileKotlinClass
kotlinClass.file.canonicalPath!!
}
else -> {
val classId = InlineCodegenUtil.getContainerClassId(this)
val className = classId?.let { JvmClassName.byClassId(it) }?.internalName
if (className != null) cache.getClassFilePath(className) else null
val classId = InlineCodegenUtil.getContainerClassId(this)!!
val className = JvmClassName.byClassId(classId).internalName
cache.getClassFilePath(className)
}
}
}