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

KT-53804 Restore old and incorrect logic of generating InnerClasses attributes for kotlin-stdlib

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-09-05 14:18:26 +02:00
committed by teamcity
parent 4d64f3a422
commit 6a14400342
13 changed files with 240 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
Generated
+12
View File
@@ -4054,11 +4054,23 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt27936.kt");
}
@Test
@TestMetadata("kt53804.kt")
public void testKt53804() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt53804.kt");
}
@Test
@TestMetadata("nestedClassInAnnotationArgument.kt")
public void testNestedClassInAnnotationArgument() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/innerClasses/nestedClassInAnnotationArgument.kt");
}
@Test
@TestMetadata("nestedClassInAnnotationArgumentOldMode.kt")
public void testNestedClassInAnnotationArgumentOldMode() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/innerClasses/nestedClassInAnnotationArgumentOldMode.kt");
}
}
@Nested
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+2
View File
@@ -49,6 +49,7 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIE
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.JDK_RELEASE
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_NEW_JAVA_ANNOTATION_TARGETS
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.OLD_INNER_CLASSES_LOGIC
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.USE_TYPE_TABLE
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
@@ -175,6 +176,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
register(USE_TYPE_TABLE, JVMConfigurationKeys.USE_TYPE_TABLE)
register(ENABLE_DEBUG_MODE, JVMConfigurationKeys.ENABLE_DEBUG_MODE)
register(NO_NEW_JAVA_ANNOTATION_TARGETS, JVMConfigurationKeys.NO_NEW_JAVA_ANNOTATION_TARGETS)
register(OLD_INNER_CLASSES_LOGIC, JVMConfigurationKeys.OLD_INNER_CLASSES_LOGIC)
}
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {