From bf60835975eb73347fcd4079832d434f633469d8 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 1 Aug 2018 08:36:40 +0200 Subject: [PATCH] Delete unused properties --- .../kotlin/ir/declarations/lazy/IrLazySymbolTable.kt | 3 --- .../src/org/jetbrains/kotlin/ir/util/SymbolTable.kt | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazySymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazySymbolTable.kt index 1a848958271..f6a8b79eaee 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazySymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazySymbolTable.kt @@ -11,9 +11,6 @@ import org.jetbrains.kotlin.ir.util.* class IrLazySymbolTable(private val originalTable: SymbolTable) : ReferenceSymbolTable by originalTable { - override val declarationSystemTable: SymbolTable = originalTable - - override val referenceSymbolTable: ReferenceSymbolTable = this /*Don't force builtins class linking before unbound symbols linking: otherwise stdlib compilation will failed*/ var stubGenerator: DeclarationStubGenerator? = null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt index 3548a239402..b504c8f7794 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.ir.util import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.ir.SourceManager import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.impl.* import org.jetbrains.kotlin.ir.declarations.lazy.IrLazySymbolTable @@ -42,10 +41,6 @@ interface ReferenceSymbolTable { fun referenceTypeParameter(classifier: TypeParameterDescriptor): IrTypeParameterSymbol fun referenceVariable(descriptor: VariableDescriptor): IrVariableSymbol - - val declarationSystemTable: SymbolTable - val referenceSymbolTable: ReferenceSymbolTable - fun enterScope(owner: DeclarationDescriptor) fun leaveScope(owner: DeclarationDescriptor) @@ -53,11 +48,7 @@ interface ReferenceSymbolTable { open class SymbolTable : ReferenceSymbolTable { - override val declarationSystemTable: SymbolTable = this - - override val referenceSymbolTable: ReferenceSymbolTable = IrLazySymbolTable(this) - - val lazyWrapper = referenceSymbolTable as IrLazySymbolTable + val lazyWrapper = IrLazySymbolTable(this) private abstract class SymbolTableBase> { val unboundSymbols = linkedSetOf()