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

FIR: Add bindings for dispatch receiver parameters

Browse Source 
Before this commit, such descriptors have null owners, which causes problems when the getter of the owner property is called.
This commit is contained in:
Juan Chen
2019-12-26 16:45:14 -08:00
committed by Mikhail Glukhikh
parent a54ef3e427
commit 4c04ad2371
27 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+3 -2
View File
@@ -309,8 +309,9 @@ class Fir2IrVisitor(
private fun IrFunction.addDispatchReceiverParameter(containingClass: IrClass) {
val thisOrigin = IrDeclarationOrigin.DEFINED
val thisType = containingClass.thisReceiver!!.type
val descriptor = WrappedValueParameterDescriptor()
dispatchReceiverParameter = symbolTable.declareValueParameter(
startOffset, endOffset, thisOrigin, WrappedValueParameterDescriptor(),
startOffset, endOffset, thisOrigin, descriptor,
thisType
) { symbol ->
IrValueParameterImpl(
@@ -318,7 +319,7 @@ class Fir2IrVisitor(
Name.special("<this>"), -1, thisType,
varargElementType = null, isCrossinline = false, isNoinline = false
).setParentByParentStack()
}
}.also { descriptor.bind(it) }
}
private fun <T : IrFunction> T.setFunctionContent(
compiler/testData/codegen/box/bridges/fakeOverrideMultiFile.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: 1.kt
class Test: Impl(), CProvider
compiler/testData/codegen/box/classes/kt2390.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class JsonObject() {
}
compiler/testData/codegen/box/defaultArguments/convention/kt9140.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class X {
operator fun get(name: String, type: String = "none") = name + type
}
compiler/testData/codegen/box/defaultArguments/function/funInTraitChain.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: JVM
// See KT-15971
compiler/testData/codegen/box/defaultArguments/inheritedFromInterfaceViaAbstractSuperclass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
interface I {
fun foo(x: Int = 23): String
}
compiler/testData/codegen/box/external/withDefaultArg.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/functions/defaultargs.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
open abstract class B {
fun foo(arg: Int = 239 + 1) : Int = arg
}
compiler/testData/codegen/box/jvm8/defaultArgs.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// FILE: Simple.java
compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !JVM_DEFAULT_MODE: compatibility
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// FILE: Simple.java
compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// WITH_RUNTIME
compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !JVM_DEFAULT_MODE: enable
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
// WITH_RUNTIME
compiler/testData/codegen/box/jvm8/javaDefaults/defaultMethodOverride.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// SKIP_JDK6
// TARGET_BACKEND: JVM
// FILE: Simple.java
compiler/testData/codegen/box/jvm8/oneImplementation.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
interface KCallable {
compiler/testData/codegen/box/jvm8/oneImplementation2.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
interface KCallable {
compiler/testData/codegen/box/jvm8/simpleCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvm8/simpleProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// JVM_TARGET: 1.8
compiler/testData/codegen/box/jvmStatic/default.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/jvmStatic/defaultCrossFile.kt
Vendored
-2
View File
@@ -1,6 +1,4 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// FILE: 1.kt
compiler/testData/codegen/box/jvmStatic/inline.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/regressions/kt3421.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
public object Globals{
operator fun get(key: String, remove: Boolean = true): String {
return "OK"
compiler/testData/codegen/box/traits/abstractClassInheritsFromInterface.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// FILE: ExtendsKCWithT.java
compiler/testData/codegen/box/traits/indirectlyInheritPropertyGetter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
interface A {
val str: String
get() = "OK"
compiler/testData/codegen/box/traits/inheritJavaInterface.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// FILE: MyInt.java
compiler/testData/codegen/box/traits/inheritedFun.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
//KT-2206
interface A {
fun f():Int = 239
compiler/testData/codegen/box/traits/interfaceWithNonAbstractFunIndirect.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
interface I {
fun foo(): String = "foo"