[IR] Use more specific type (IrSimpleFunction) for accessors in IrLocalDelegatedProperty

This commit is contained in:
Zalim Bashorov
2020-11-05 02:44:15 +03:00
committed by teamcityserver
parent 11bc1c0753
commit 2c1e4c1769
4 changed files with 22 additions and 55 deletions
@@ -1,17 +1,6 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.ir.declarations.persistent
@@ -78,9 +67,9 @@ internal class PersistentIrLocalDelegatedProperty(
}
}
override var getterField: IrFunction? = null
override var getterField: IrSimpleFunction? = null
override var getter: IrFunction
override var getter: IrSimpleFunction
get() = getCarrier().getterField!!
set(v) {
if (getCarrier().getterField !== v) {
@@ -88,9 +77,9 @@ internal class PersistentIrLocalDelegatedProperty(
}
}
override var setterField: IrFunction? = null
override var setterField: IrSimpleFunction? = null
override var setter: IrFunction?
override var setter: IrSimpleFunction?
get() = getCarrier().setterField
set(v) {
if (setter !== v) {
@@ -1,6 +1,6 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.ir.declarations.persistent.carriers
@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.ir.types.IrType
internal interface LocalDelegatedPropertyCarrier : DeclarationCarrier {
var typeField: IrType
var delegateField: IrVariable?
var getterField: IrFunction?
var setterField: IrFunction?
var getterField: IrSimpleFunction?
var setterField: IrSimpleFunction?
var metadataField: MetadataSource?
override fun clone(): LocalDelegatedPropertyCarrier {
@@ -38,7 +38,7 @@ internal class LocalDelegatedPropertyCarrierImpl(
override var annotationsField: List<IrConstructorCall>,
override var typeField: IrType,
override var delegateField: IrVariable?,
override var getterField: IrFunction?,
override var setterField: IrFunction?,
override var getterField: IrSimpleFunction?,
override var setterField: IrSimpleFunction?,
override var metadataField: MetadataSource?
) : LocalDelegatedPropertyCarrier