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

JVM: remove lookupLocation from SourceCompilerForInline

Browse Source
This commit is contained in:
pyos
2021-05-27 18:39:49 +02:00
committed by max-kammerer
parent b6e9f64e18
commit 1109348b6d
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/PsiSourceCompilerForInline.kt
+3 -3
View File
@@ -54,8 +54,6 @@ class PsiSourceCompilerForInline(
additionalInnerClasses
) as MethodContext
override val lookupLocation = KotlinLookupLocation(callElement)
override val callElementText: String by lazy { callElement.text }
override val callsiteFile by lazy { callElement.containingFile }
@@ -247,7 +245,9 @@ class PsiSourceCompilerForInline(
val asmMethod = if (callDefault) mapDefault() else jvmSignature.asmMethod
if (asmMethod.name != functionDescriptor.name.asString()) {
trackLookup(DescriptorUtils.getFqNameSafe(functionDescriptor.containingDeclaration), asmMethod.name) // ?
KotlinLookupLocation(callElement).location?.let {
state.trackLookup(DescriptorUtils.getFqNameSafe(functionDescriptor.containingDeclaration), asmMethod.name, it)
}
}
val directMember = getDirectMemberAndCallableFromObject()
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SourceCompilerForInline.kt
+4 -8
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.name.ClassId
@@ -30,8 +30,6 @@ interface SourceCompilerForInline {
val callElement: Any
val lookupLocation: LookupLocation
val callElementText: String
val callsiteFile: PsiFile?
@@ -68,13 +66,11 @@ interface SourceCompilerForInline {
fun reportSuspensionPointInsideMonitor(stackTraceElement: String)
}
fun SourceCompilerForInline.trackLookup(container: FqName, functionName: String) {
val lookupTracker = state.configuration.get(CommonConfigurationKeys.LOOKUP_TRACKER) ?: return
val location = lookupLocation.location ?: return
val position = if (lookupTracker.requiresPosition) location.position else Position.NO_POSITION
fun GenerationState.trackLookup(container: FqName, functionName: String, location: LocationInfo) {
val lookupTracker = configuration.get(CommonConfigurationKeys.LOOKUP_TRACKER) ?: return
lookupTracker.record(
location.filePath,
position,
if (lookupTracker.requiresPosition) location.position else Position.NO_POSITION,
container.asString(),
ScopeKind.CLASSIFIER,
functionName