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

[FIR] Revert workaround for IC issue surfaced by KT-58335

Browse Source 
#KT-28233
This commit is contained in:
Kirill Rakhman
2023-05-11 17:42:43 +02:00
committed by Space Team
parent 878dd67d92
commit a50ae9db9d
16 changed files with 6 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
+2 -11
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir.deserialization
import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.computeTypeAttributes
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
@@ -203,22 +202,14 @@ class FirTypeDeserializer(
}
// TODO: Return abbreviated types for type aliases, see KT-58542
// This condition is true when the type is precompiled for incremental compilation.
// Using the expanded type leads to the issue described in KT-28233 so we work around it by using the abbreviated type.
// The proper solution would be to mark files that depend on a changed type alias as dirty during IC.
return if (moduleData.session.kind == FirSession.Kind.Source) {
val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType
simpleType(abbreviatedTypeProto, attributes)
} else {
simpleType
}
return simpleType
}
private fun createSuspendFunctionTypeForBasicCase(
functionTypeConstructor: ConeClassLikeLookupTag,
arguments: Array<ConeTypeProjection>,
isNullable: Boolean,
attributes: ConeAttributes,
attributes: ConeAttributes
): ConeClassLikeType? {
fun ConeClassLikeType.isContinuation(): Boolean {
if (this.typeArguments.size != 1) return false
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
+3 -13
View File
@@ -76,11 +76,6 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
@@ -921,12 +916,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInScopeExpansion() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
}
@TestMetadata("changeTypeAliasAndUsage")
public void testChangeTypeAliasAndUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/");
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage")
@@ -938,7 +928,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInChangeTypeAliasAndUsage() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
}
@@ -951,7 +941,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInProtectedBecomesPublicAccessedTroughChild() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
}
}
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
-5
View File
@@ -76,11 +76,6 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -1
View File
@@ -138,7 +138,7 @@ fun main(args: Array<String>) {
excludedPattern = "^(secondaryConstructorAdded|withIntermediateBodiesChanged|companionObjectNameChanged).*")
model("incremental/js", extension = null, excludeParentDirs = true)
model("incremental/scopeExpansion", extension = null, excludeParentDirs = true,
excludedPattern = "^protectedBecomesPublicAccessedTroughChild.*")
excludedPattern = "^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*")
}
testClass<AbstractIncrementalJsCompilerRunnerWithFriendModulesDisabledTest> {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2FirICLightTreeJvmJpsTestGenerated.java
Generated
-5
View File
@@ -77,11 +77,6 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2JvmJpsTestGenerated.java
Generated
-5
View File
@@ -77,11 +77,6 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2LightTreeJvmJpsTestGenerated.java
Generated
-5
View File
@@ -77,11 +77,6 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/Foo.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
interface Foo {
val values: Type
}
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/FooImpl.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
class FooImpl : Foo {
override val values: Type
get() = "0"
}
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/FooImpl.kt.new.1
Vendored
-4
View File
@@ -1,4 +0,0 @@
class FooImpl : Foo {
override val values: Type
get() = 0
}
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/build.log
Vendored
-35
View File
@@ -1,35 +0,0 @@
================ Step #1 =================
Cleaning output files:
out/production/module/FooImpl.class
out/production/module/META-INF/module.kotlin_module
out/production/module/TypesKt.class
End of files
Compiling files:
src/FooImpl.kt
src/types.kt
End of files
After build round. Marked as dirty by Kotlin:
src/Foo.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/Foo.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Foo.kt
End of files
After build round. Marked as dirty by Kotlin:
src/FooImpl.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/FooImpl.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/FooImpl.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/types.kt
Vendored
-1
View File
@@ -1 +0,0 @@
typealias Type = String
jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/types.kt.new.1
Vendored
-1
View File
@@ -1 +0,0 @@
typealias Type = Int