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

Fix tracking lookups when compile using daemon

Browse Source
This commit is contained in:
Zalim Bashorov
2015-11-13 20:14:05 +03:00
parent 49db4e93c0
commit 6305bbda5d
9 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/incremental/KotlinLookupLocation.kt
+1 -1
View File
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnInPsiFile
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LocationInfo.Position
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.doNotAnalyze
compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/CompilerCallbackServicesFacadeServer.kt
+5 -3
View File
@@ -16,8 +16,8 @@
package org.jetbrains.kotlin.rmi.kotlinr
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
@@ -65,8 +65,10 @@ public class CompilerCallbackServicesFacadeServer(
incrementalCompilationComponents!!.getIncrementalCache(target).close()
}
override fun lookupTracker_record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
incrementalCompilationComponents!!.getLookupTracker().record(locationInfo, scopeFqName, scopeKind, name)
override fun lookupTracker_requiresPosition() = incrementalCompilationComponents!!.getLookupTracker().requiresPosition
override fun lookupTracker_record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
incrementalCompilationComponents!!.getLookupTracker().record(filePath, position, scopeFqName, scopeKind, name)
}
private val lookupTracker_isDoNothing: Boolean = incrementalCompilationComponents != null && incrementalCompilationComponents.getLookupTracker() == LookupTracker.DO_NOTHING
compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompilerCallbackServicesFacade.kt
+5 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.rmi
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.load.kotlin.incremental.components.JvmPackagePartProto
import org.jetbrains.kotlin.modules.TargetId
@@ -72,8 +72,10 @@ public interface CompilerCallbackServicesFacade : Remote {
// ----------------------------------------------------
// LookupTracker
@Throws(RemoteException::class)
fun lookupTracker_record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String)
fun lookupTracker_requiresPosition(): Boolean
fun lookupTracker_record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String)
@Throws(RemoteException::class)
fun lookupTracker_isDoNothing(): Boolean
compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteLookupTrackerClient.kt
+5 -3
View File
@@ -16,8 +16,8 @@
package org.jetbrains.kotlin.rmi.service
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
import org.jetbrains.kotlin.rmi.DummyProfiler
@@ -27,10 +27,12 @@ import org.jetbrains.kotlin.rmi.Profiler
class RemoteLookupTrackerClient(val facade: CompilerCallbackServicesFacade, val profiler: Profiler = DummyProfiler()) : LookupTracker {
private val isDoNothing = profiler.withMeasure(this) { facade.lookupTracker_isDoNothing() }
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
override val requiresPosition: Boolean = profiler.withMeasure(this) { facade.lookupTracker_requiresPosition() }
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
if (!isDoNothing) {
profiler.withMeasure(this) {
facade.lookupTracker_record(locationInfo, scopeFqName, scopeKind, name)
facade.lookupTracker_record(filePath, position, scopeFqName, scopeKind, name)
}
}
}
core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
+7 -1
View File
@@ -16,6 +16,8 @@
package org.jetbrains.kotlin.incremental.components
import java.io.Serializable
public interface LookupLocation {
val location: LocationInfo?
}
@@ -25,8 +27,12 @@ interface LocationInfo {
// only for tests
val position: Position
}
data class Position(val line: Int, val column: Int)
data class Position(val line: Int, val column: Int) : Serializable {
companion object {
val NO_POSITION = Position(-1, -1)
}
}
public enum class NoLookupLocation : LookupLocation {
core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
+9 -2
View File
@@ -17,8 +17,12 @@
package org.jetbrains.kotlin.incremental.components
public interface LookupTracker {
// used in tests for more accurate checks
val requiresPosition: Boolean
fun record(
locationInfo: LocationInfo,
filePath: String,
position: Position,
scopeFqName: String,
scopeKind: ScopeKind,
name: String
@@ -26,7 +30,10 @@ public interface LookupTracker {
companion object {
val DO_NOTHING: LookupTracker = object : LookupTracker {
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
override val requiresPosition: Boolean
get() = false
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
}
}
}
core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt
+4 -5
View File
@@ -19,10 +19,7 @@ package org.jetbrains.kotlin.incremental
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.incremental.components.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.scopes.MemberScope
@@ -39,5 +36,7 @@ public fun LookupTracker.record(from: LookupLocation, scopeOwner: DeclarationDes
else -> throw AssertionError("Unexpected containing declaration type: ${scopeOwner.javaClass}")
}
record(location, scopeOwner.fqNameUnsafe.asString(), scopeKind, name.asString())
val position = if (requiresPosition) location.position else Position.NO_POSITION
record(location.filePath, position, scopeOwner.fqNameUnsafe.asString(), scopeKind, name.asString())
}
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt
+7 -4
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.jps.incremental
import com.intellij.util.containers.MultiMap
import org.jetbrains.annotations.TestOnly
import org.jetbrains.jps.builders.storage.StorageProvider
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.jps.incremental.storage.*
import org.jetbrains.kotlin.utils.Printer
@@ -184,9 +184,12 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() {
class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
val lookups = MultiMap<LookupSymbol, String>()
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
lookups.putValue(LookupSymbol(name, scopeFqName), locationInfo.filePath)
delegate.record(locationInfo, scopeFqName, scopeKind, name)
override val requiresPosition: Boolean
get() = delegate.requiresPosition
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
lookups.putValue(LookupSymbol(name, scopeFqName), filePath)
delegate.record(filePath, position, scopeFqName, scopeKind, name)
}
}
jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+7 -5
View File
@@ -17,11 +17,10 @@
package org.jetbrains.kotlin.jps.build
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.join
import java.io.File
import java.util.*
@@ -120,9 +119,12 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest(
class TestLookupTracker : LookupTracker {
val lookups = arrayListOf<LookupInfo>()
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
val (line, column) = locationInfo.position
lookups.add(LookupInfo(locationInfo.filePath, line, column, scopeFqName, scopeKind, name))
override val requiresPosition: Boolean
get() = true
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
val (line, column) = position
lookups.add(LookupInfo(filePath, line, column, scopeFqName, scopeKind, name))
}
data class LookupInfo(