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

Simplify findLocalIndex in ExpressionCodegen

Browse Source
This commit is contained in:
Steven Schäfer
2019-04-30 13:23:58 +02:00
committed by Georgy Bronnikov
parent b04dc69157
commit 1e08b3c7da
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+1 -5
View File
@@ -463,12 +463,8 @@ class ExpressionCodegen(
private fun findLocalIndex(irSymbol: IrSymbol): Int { private fun findLocalIndex(irSymbol: IrSymbol): Int {
val index = frameMap.getIndex(irSymbol) val index = frameMap.getIndex(irSymbol)
if (index >= 0) { if (index >= 0)
return index return index
}
if (irFunction.dispatchReceiverParameter != null && (irFunction.parent as? IrClass)?.thisReceiver?.symbol == irSymbol) {
return 0
}
val dump = if (irSymbol.isBound) irSymbol.owner.dump() else irSymbol.descriptor.toString() val dump = if (irSymbol.isBound) irSymbol.owner.dump() else irSymbol.descriptor.toString()
throw AssertionError("Non-mapped local declaration: $dump\n in ${irFunction.dump()}") throw AssertionError("Non-mapped local declaration: $dump\n in ${irFunction.dump()}")
} }