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

[FIR] Split primary constructor parameter scope into two different

Browse Source 
In init block or property initializers,
for `val x` declared in primary constructor,
`x` reference is now resolved to property, not to parameter.
So we need two different scopes for primary constructor,
one for 'pure' parameters and another one for all parameters,
including val/var ones.

#KT-42844 Fixed
This commit is contained in:
Mikhail Glukhikh
2020-10-21 10:39:59 +03:00
parent 2d0535a713
commit 7b4f781ea8
24 changed files with 592 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt
Vendored
+5 -5
View File
@@ -47,7 +47,7 @@ FILE: propertyTypeMismatchOnOverride.kt
public final val value: R|T| = R|<local>/value|
public get(): R|T|
public final override var test: R|T| = R|<local>/value|
public final override var test: R|T| = this@R|/E|.R|/E.value|
public get(): R|T|
public set(value: R|T|): R|kotlin/Unit|
@@ -60,7 +60,7 @@ FILE: propertyTypeMismatchOnOverride.kt
public final val value: R|T| = R|<local>/value|
public get(): R|T|
public open var rest: R|T| = R|<local>/value|
public open var rest: R|T| = this@R|/F|.R|/F.value|
public get(): R|T|
public set(value: R|T|): R|kotlin/Unit|
@@ -73,7 +73,7 @@ FILE: propertyTypeMismatchOnOverride.kt
public final val balue: R|E| = R|<local>/balue|
public get(): R|E|
public final override var rest: R|E| = R|<local>/balue|
public final override var rest: R|E| = this@R|/G|.R|/G.balue|
public get(): R|E|
public set(value: R|E|): R|kotlin/Unit|
@@ -86,7 +86,7 @@ FILE: propertyTypeMismatchOnOverride.kt
public final val balue: R|E| = R|<local>/balue|
public get(): R|E|
public final override var rest: R|E| = R|<local>/balue|
public final override var rest: R|E| = this@R|/H|.R|/H.balue|
public get(): R|E|
public set(value: R|E|): R|kotlin/Unit|
@@ -99,7 +99,7 @@ FILE: propertyTypeMismatchOnOverride.kt
public final val balue: R|E| = R|<local>/balue|
public get(): R|E|
public final override var rest: R|E| = R|<local>/balue|
public final override var rest: R|E| = this@R|/M|.R|/M.balue|
public get(): R|E|
public set(value: R|E|): R|kotlin/Unit|
compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ FILE: repeatedModifier.kt
private final val int: R|kotlin/Int| = R|<local>/int|
private get(): R|kotlin/Int|
protected final var double: R|kotlin/Double| = R|<local>/int|.R|kotlin/Int.plus|(Double(8.0))
protected final var double: R|kotlin/Double| = this@R|/E|.R|/E.int|.R|kotlin/Int.plus|(Double(8.0))
protected get(): R|kotlin/Double|
protected set(value: R|kotlin/Double|): R|kotlin/Unit|
compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ FILE: CallBasedInExpressionGenerator.kt
public final val codegen: R|org/jetbrains/kotlin/codegen/range/inExpression/ExpressionCodegen| = R|<local>/codegen|
public get(): R|org/jetbrains/kotlin/codegen/range/inExpression/ExpressionCodegen|
private final val resolvedCall: R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert| = R|<local>/operatorReference|.<Unresolved name: getResolvedCallWithAssert>#(R|<local>/codegen|.<Unresolved name: bindingContext>#)
private final val resolvedCall: R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert| = R|<local>/operatorReference|.<Unresolved name: getResolvedCallWithAssert>#(this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.codegen|.<Unresolved name: bindingContext>#)
private get(): R|ERROR CLASS: Unresolved name: getResolvedCallWithAssert|
private final val isInverted: R|kotlin/Boolean| = ==(R|<local>/operatorReference|.<Unresolved name: getReferencedNameElementType>#(), <Unresolved name: KtTokens>#.<Unresolved name: NOT_IN>#)
compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt
Vendored
+1 -1
View File
@@ -58,7 +58,7 @@ FILE: enums.kt
}
public final val g: R|kotlin/Double| = this@R|/Planet.Companion|.R|/Planet.Companion.G|.R|kotlin/Double.times|(R|<local>/m|).R|kotlin/Double.div|(R|<local>/r|.R|kotlin/Double.times|(R|<local>/r|))
public final val g: R|kotlin/Double| = this@R|/Planet.Companion|.R|/Planet.Companion.G|.R|kotlin/Double.times|(this@R|/Planet|.R|/Planet.m|).R|kotlin/Double.div|(this@R|/Planet|.R|/Planet.r|.R|kotlin/Double.times|(this@R|/Planet|.R|/Planet.r|))
public get(): R|kotlin/Double|
public abstract fun sayHello(): R|kotlin/Unit|
compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
Vendored
+4 -4
View File
@@ -46,9 +46,9 @@ FILE: KotlinClass.kt
public get(): R|JavaClass?|
public final val x: R|(KotlinClass) -> kotlin/Boolean| = when () {
!=(R|<local>/javaClass|, Null(null)) -> {
!=(this@R|/Case1|.R|/Case1.javaClass|, Null(null)) -> {
fun <anonymous>(it: R|KotlinClass|): R|kotlin/Boolean| {
^ ==(R|<local>/it|, R|<local>/javaClass|)
^ ==(R|<local>/it|, this@R|/Case1|.R|/Case1.javaClass|)
}
}
@@ -139,9 +139,9 @@ FILE: KotlinClass.kt
public get(): R|KotlinClass?|
public final val x: R|(KotlinClass) -> kotlin/Boolean| = when () {
!=(R|<local>/kotlinClass|, Null(null)) -> {
!=(this@R|/Case2|.R|/Case2.kotlinClass|, Null(null)) -> {
fun <anonymous>(it: R|KotlinClass|): R|kotlin/Boolean| {
^ ==(R|<local>/it|, R|<local>/kotlinClass|)
^ ==(R|<local>/it|, this@R|/Case2|.R|/Case2.kotlinClass|)
}
}