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

Report @JvmOverloads errors on annotation, not on entire declaration (KT-12701)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-11-17 12:02:47 +01:00
parent d3ccbe8172
commit 12e4cf9a4f
7 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+2 -4
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
import org.jetbrains.kotlin.resolve.jvm.AsmTypes
import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation
import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation
import org.jetbrains.kotlin.resolve.jvm.diagnostics.OtherOrigin
import org.jetbrains.org.objectweb.asm.Label
import org.jetbrains.org.objectweb.asm.Opcodes
@@ -83,9 +83,7 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
classBuilder: ClassBuilder,
memberCodegen: MemberCodegen<*>
): Boolean {
if (!functionDescriptor.hasJvmOverloadsAnnotation()) {
return false
}
functionDescriptor.findJvmOverloadsAnnotation() ?: return false
val count = functionDescriptor.countDefaultParameters()