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

Fix Symbols::isTypeOfIntrinsic implementation

Browse Source 
Function did not work as expected for JVM backend
This commit is contained in:
vladislav.grechko
2023-07-27 18:27:24 +02:00
committed by Space Team
parent 286196e8b2
commit cb43f3c805
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
+4 -4
View File
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.builtins.PrimitiveType
import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME import org.jetbrains.kotlin.builtins.StandardNames.KOTLIN_REFLECT_FQ_NAME
import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.IrBuiltIns
import org.jetbrains.kotlin.ir.declarations.IrPackageFragment
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
@@ -253,9 +252,10 @@ abstract class Symbols(
fun isTypeOfIntrinsic(symbol: IrFunctionSymbol): Boolean = fun isTypeOfIntrinsic(symbol: IrFunctionSymbol): Boolean =
symbol is IrSimpleFunctionSymbol && symbol.owner.let { function -> symbol is IrSimpleFunctionSymbol && symbol.owner.let { function ->
function.name.asString() == "typeOf" && function.isTopLevelInPackage("typeOf", KOTLIN_REFLECT_FQ_NAME)
function.valueParameters.isEmpty() && && function.valueParameters.isEmpty()
(function.parent as? IrPackageFragment)?.packageFqName == KOTLIN_REFLECT_FQ_NAME && function.dispatchReceiverParameter == null
&& function.extensionReceiverParameter == null
} }
} }
} }
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+3
View File
@@ -1617,3 +1617,6 @@ val IrDeclaration.isExpect
fun IrElement.sourceElement(): AbstractKtSourceElement? = fun IrElement.sourceElement(): AbstractKtSourceElement? =
if (startOffset >= 0) KtOffsetsOnlySourceElement(this.startOffset, this.endOffset) if (startOffset >= 0) KtOffsetsOnlySourceElement(this.startOffset, this.endOffset)
else null else null
fun IrFunction.isTopLevelInPackage(name: String, packageFqName: FqName) =
this.name.asString() == name && parent.kotlinFqName == packageFqName