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

[IR BE] Don't use symbol table in SuspendFunctionLowering

Browse Source
This commit is contained in:
Roman Artemev
2019-04-23 14:37:30 +03:00
committed by romanart
parent bec5879e3a
commit 89500d776d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractSuspendFunctionsLowering.kt
+7 -7
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.ir.util.defaultType
import org.jetbrains.kotlin.ir.visitors.* import org.jetbrains.kotlin.ir.visitors.*
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val context: C, val symbolTable: SymbolTable) : FileLoweringPass { abstract class AbstractSuspendFunctionsLowering<C : CommonBackendContext>(val context: C) : FileLoweringPass {
protected object STATEMENT_ORIGIN_COROUTINE_IMPL : IrStatementOriginImpl("COROUTINE_IMPL") protected object STATEMENT_ORIGIN_COROUTINE_IMPL : IrStatementOriginImpl("COROUTINE_IMPL")
protected object DECLARATION_ORIGIN_COROUTINE_IMPL : IrDeclarationOriginImpl("COROUTINE_IMPL") protected object DECLARATION_ORIGIN_COROUTINE_IMPL : IrDeclarationOriginImpl("COROUTINE_IMPL")
@@ -272,7 +272,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrClassImpl( IrClassImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceClass(d), IrClassSymbolImpl(d),
"${irFunction.name}COROUTINE\$${coroutineId++}".synthesizedName, "${irFunction.name}COROUTINE\$${coroutineId++}".synthesizedName,
ClassKind.CLASS, ClassKind.CLASS,
irFunction.visibility, irFunction.visibility,
@@ -377,7 +377,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrConstructorImpl( IrConstructorImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceConstructor(d), IrConstructorSymbolImpl(d),
coroutineBaseClassConstructor.name, coroutineBaseClassConstructor.name,
irFunction.visibility, irFunction.visibility,
coroutineClass.defaultType, coroutineClass.defaultType,
@@ -422,7 +422,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrConstructorImpl( IrConstructorImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceConstructor(d), IrConstructorSymbolImpl(d),
coroutineBaseClassConstructor.name, coroutineBaseClassConstructor.name,
irFunction.visibility, irFunction.visibility,
coroutineClass.defaultType, coroutineClass.defaultType,
@@ -467,7 +467,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrFunctionImpl( IrFunctionImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceSimpleFunction(d), IrSimpleFunctionSymbolImpl(d),
Name.identifier("create"), Name.identifier("create"),
Visibilities.PROTECTED, Visibilities.PROTECTED,
Modality.FINAL, Modality.FINAL,
@@ -532,7 +532,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrFunctionImpl( IrFunctionImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceSimpleFunction(d), IrSimpleFunctionSymbolImpl(d),
Name.identifier("invoke"), Name.identifier("invoke"),
Visibilities.PROTECTED, Visibilities.PROTECTED,
Modality.FINAL, Modality.FINAL,
@@ -590,7 +590,7 @@ abstract class AbstractSuspendFunctionsLowering<C: CommonBackendContext>(val con
IrFunctionImpl( IrFunctionImpl(
startOffset, endOffset, startOffset, endOffset,
DECLARATION_ORIGIN_COROUTINE_IMPL, DECLARATION_ORIGIN_COROUTINE_IMPL,
symbolTable.referenceSimpleFunction(d), IrSimpleFunctionSymbolImpl(d),
stateMachineFunction.name, stateMachineFunction.name,
stateMachineFunction.visibility, stateMachineFunction.visibility,
Modality.FINAL, Modality.FINAL,
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/coroutines/JsSuspendFunctionsLowering.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptVoid
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.DFS import org.jetbrains.kotlin.utils.DFS
class JsSuspendFunctionsLowering(ctx: JsIrBackendContext) : AbstractSuspendFunctionsLowering<JsIrBackendContext>(ctx, ctx.symbolTable) { class JsSuspendFunctionsLowering(ctx: JsIrBackendContext) : AbstractSuspendFunctionsLowering<JsIrBackendContext>(ctx) {
private val coroutineImplExceptionPropertyGetter = ctx.coroutineImplExceptionPropertyGetter private val coroutineImplExceptionPropertyGetter = ctx.coroutineImplExceptionPropertyGetter
private val coroutineImplExceptionPropertySetter = ctx.coroutineImplExceptionPropertySetter private val coroutineImplExceptionPropertySetter = ctx.coroutineImplExceptionPropertySetter