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

[NI] Use original descriptor for functions imported from object during JS mangling

Browse Source 
^KT-35904 Fixed
This commit is contained in:
Victor Petukhov
2020-01-28 18:23:31 +03:00
parent fa924065ca
commit 4490efab3e
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
+4 -4
View File
@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.types.TypeSubstitutor
fun FunctionDescriptor.asImportedFromObject(original: FunctionImportedFromObject? = null) =
FunctionImportedFromObject(this, original)
fun FunctionDescriptor.asImportedFromObject(descriptor: FunctionImportedFromObject? = null) =
FunctionImportedFromObject(this, descriptor?.original)
fun PropertyDescriptor.asImportedFromObject(original: PropertyImportedFromObject? = null) =
PropertyImportedFromObject(this, original)
fun PropertyDescriptor.asImportedFromObject(descriptor: PropertyImportedFromObject? = null) =
PropertyImportedFromObject(this, descriptor?.original)
abstract class ImportedFromObjectCallableDescriptor<out TCallable : CallableMemberDescriptor>(
val callableFromObject: TCallable,