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

FIR: Add test on delegated member with default param in overridden...

Browse Source 
sensitive to the file processing order, therefore failing on the
current fir2ir at least with the new irBuiltIns
This commit is contained in:
Ilya Chernikov
2021-06-21 17:12:28 +02:00
committed by TeamCityServer
parent a2385b5edd
commit c9b6847d83
10 changed files with 68 additions and 8 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
@@ -13939,6 +13939,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@Test
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@Nested
compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// FILE: lib.kt
interface ResolutionScope {
fun getContributedDescriptors(s: String = "OK"): String
}
// processing deprecatedScopes.kt before scopes.kt should show that there is no problem in processing delegated members after fake overrides
// FILE: deprecatedScopes.kt
abstract class DeprecatedLexicalScope(a: LexicalScope) : LexicalScope by a
// FILE: scopes.kt
interface LexicalScope : ResolutionScope
// FILE: main.kt
class ScopeImpl : LexicalScope {
override fun getContributedDescriptors(s: String): String = s
}
class Impl : DeprecatedLexicalScope(ScopeImpl())
fun box(): String = Impl().getContributedDescriptors()
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -13939,6 +13939,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@Test
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@Nested
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -13939,6 +13939,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@Test
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@Nested
compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractKlibTextTestCase.kt
+5 -8
View File
@@ -30,8 +30,7 @@ import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsIrModuleSeria
import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
import org.jetbrains.kotlin.ir.descriptors.IrBuiltInsOverDescriptors
import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
@@ -206,6 +205,7 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
return klibDir.canonicalPath
}
@OptIn(ObsoleteDescriptorBasedAPI::class)
protected fun deserializeModule(stdlib: KotlinLibrary, klib: KotlinLibrary): IrModuleFragment {
val signaturer = IdSignatureDescriptor(JsManglerDesc)
@@ -215,10 +215,8 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
val symbolTable = SymbolTable(signaturer, IrFactoryImpl)
val typeTranslator =
TypeTranslatorImpl(symbolTable, myEnvironment.configuration.languageVersionSettings, testDescriptor)
val irBuiltIns = IrBuiltIns(testDescriptor.builtIns, typeTranslator, symbolTable)
val functionFactory = IrFunctionFactory(irBuiltIns, symbolTable)
irBuiltIns.functionFactory = functionFactory
val irLinker = JsIrLinker(null, IrMessageLogger.None, irBuiltIns, symbolTable, functionFactory, null, null)
val irBuiltIns = IrBuiltInsOverDescriptors(testDescriptor.builtIns, typeTranslator, symbolTable)
val irLinker = JsIrLinker(null, IrMessageLogger.None, irBuiltIns, symbolTable, null, null)
irLinker.deserializeIrModuleHeader(stdlibDescriptor, stdlib)
val testModule = irLinker.deserializeIrModuleHeader(testDescriptor, klib, DeserializationStrategy.ALL)
irLinker.init(null, emptyList())
@@ -275,8 +273,7 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), IrFactoryImpl, NameProvider.DEFAULT)
val context = psi2Ir.createGeneratorContext(moduleDescriptor, bindingContext, symbolTable)
val irBuiltIns = context.irBuiltIns
val functionFactory = IrFunctionFactory(irBuiltIns, symbolTable)
val irLinker = JsIrLinker(moduleDescriptor, IrMessageLogger.None, irBuiltIns, symbolTable, functionFactory, null, null)
val irLinker = JsIrLinker(moduleDescriptor, IrMessageLogger.None, irBuiltIns, symbolTable, null, null)
irLinker.deserializeIrModuleHeader(stdlibDescriptor, stdlib)
return psi2Ir.generateModuleFragment(context, ktFiles, listOf(irLinker), emptyList(), expectActualSymbols) to bindingContext
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -11348,6 +11348,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/deprecated")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -10072,6 +10072,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/deprecated")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -9478,6 +9478,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/deprecated")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -9478,6 +9478,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/deprecated")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -4466,6 +4466,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
public void testWithDefaultParameters() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultParameters.kt");
}
@TestMetadata("withDefaultsMultipleFilesOrder.kt")
public void testWithDefaultsMultipleFilesOrder() throws Exception {
runTest("compiler/testData/codegen/box/delegation/withDefaultsMultipleFilesOrder.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/deprecated")