'isInlineOnlyOrReified' renamed to 'isInlineOnlyOrReifiable'

This commit is contained in:
Mikhael Bogdanov
2017-01-10 11:01:47 +01:00
parent dc4cdbf82d
commit ff734ce9ea
6 changed files with 11 additions and 12 deletions
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.resolve.inline
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.isInlineOnlyOrReified
import org.jetbrains.kotlin.descriptors.annotations.isInlineOnlyOrReifiable
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
@@ -140,7 +140,7 @@ object InlineAnalyzerExtension : AnalyzerExtensions.AnalyzerExtension {
}
if (InlineUtil.containsReifiedTypeParameters(functionDescriptor) ||
functionDescriptor.isInlineOnlyOrReified() ||
functionDescriptor.isInlineOnlyOrReifiable() ||
functionDescriptor.isHeader) return
val reportOn = function.modifierList?.getModifier(KtTokens.INLINE_KEYWORD) ?: function