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

Don't save constant value for non-resolved array expression in K1

Browse Source 
#KT-55912 Fixed
This commit is contained in:
Ivan Kylchik
2023-01-23 18:02:19 +01:00
committed by Space Team
parent 8fcea399f9
commit 13cad2a820
15 changed files with 89 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -17063,6 +17063,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/evaluate/intrinsics.kt");
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ValueClassDeclarationChecker.kt
+1 -13
View File
@@ -19,10 +19,7 @@ import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperClassifiers
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.typeUtil.isNothing
import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
import org.jetbrains.kotlin.types.typeUtil.*
private val javaLangCloneable = FqNameUnsafe("java.lang.Cloneable")
@@ -193,15 +190,6 @@ object ValueClassDeclarationChecker : DeclarationChecker {
private fun KotlinType.isInapplicableParameterType() =
isUnit() || isNothing()
private fun KotlinType.isGenericArrayOfTypeParameter(): Boolean {
if (!KotlinBuiltIns.isArray(this)) return false
val argument0 = arguments[0]
if (argument0.isStarProjection) return false
val argument0type = argument0.type
return argument0type.isTypeParameter() ||
argument0type.isGenericArrayOfTypeParameter()
}
private fun isParameterAcceptableForInlineClass(parameter: KtParameter): Boolean {
val isOpen = parameter.modalityModifier()?.node?.elementType == KtTokens.OPEN_KEYWORD
return parameter.hasValOrVar() && !parameter.isMutable && !parameter.isVarArg && !isOpen
compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+7
View File
@@ -49,6 +49,7 @@ import org.jetbrains.kotlin.types.expressions.DoubleColonLHS
import org.jetbrains.kotlin.types.expressions.OperatorConventions
import org.jetbrains.kotlin.types.isError
import org.jetbrains.kotlin.types.typeUtil.isBoolean
import org.jetbrains.kotlin.types.typeUtil.isGenericArrayOfTypeParameter
import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
import org.jetbrains.kotlin.util.OperatorNameConventions
import java.math.BigInteger
@@ -408,6 +409,12 @@ private class ConstantExpressionEvaluatorVisitor(
if (shouldSkipComplexBooleanValue(expression, compileTimeConstant)) {
return null
}
// If constant is `Array` and its argument is some generic type, then we must wait for full resolve and only when we can record value
if (compileTimeConstant is TypedCompileTimeConstant && compileTimeConstant.type.isGenericArrayOfTypeParameter()) {
return compileTimeConstant
}
trace.record(BindingContext.COMPILE_TIME_VALUE, expression, compileTimeConstant)
return compileTimeConstant
}
compiler/testData/codegen/box/evaluate/kt55912.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
public annotation class Entity(val foreignKeys: Array<String>)
@Entity(foreignKeys = kotlin.arrayOf("id")) // works without "kotlin."
class Record
fun box(): String {
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16757,6 +16757,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/evaluate/intrinsics.kt");
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -17063,6 +17063,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/evaluate/intrinsics.kt");
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13830,6 +13830,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/evaluate/intrinsics.kt");
}
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt9443.kt");
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt
+9
View File
@@ -101,6 +101,15 @@ fun KotlinType?.isArrayOfNothing(): Boolean {
return typeArg != null && KotlinBuiltIns.isNothingOrNullableNothing(typeArg)
}
fun KotlinType.isGenericArrayOfTypeParameter(): Boolean {
if (!KotlinBuiltIns.isArray(this)) return false
val argument0 = arguments[0]
if (argument0.isStarProjection) return false
val argument0type = argument0.type
return argument0type.isTypeParameter() ||
argument0type.isGenericArrayOfTypeParameter()
}
fun KotlinType.isSubtypeOf(superType: KotlinType): Boolean = KotlinTypeChecker.DEFAULT.isSubtypeOf(this, superType)
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -12913,6 +12913,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13009,6 +13009,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13009,6 +13009,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13009,6 +13009,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -11535,6 +11535,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
}
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt9443.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14188,6 +14188,12 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14023,6 +14023,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt55912.kt")
public void testKt55912() throws Exception {
runTest("compiler/testData/codegen/box/evaluate/kt55912.kt");
}
@Test
@TestMetadata("kt9443.kt")
public void testKt9443() throws Exception {