diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java index c311b1e845c..db3c42a3ab0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java @@ -22,6 +22,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.InlineUtil; @@ -128,21 +129,13 @@ public class InlineAnalyzerExtension implements FunctionAnalyzerExtension.Analyz hasInlinable |= checkInlinableParameter(receiverParameter, receiver, functionDescriptor, trace); } - hasInlinable |= containsReifiedTypeParameters(functionDescriptor); + hasInlinable |= DescriptorUtils.containsReifiedTypeParameters(functionDescriptor); if (!hasInlinable) { trace.report(Errors.NOTHING_TO_INLINE.on(function, functionDescriptor)); } } - private static boolean containsReifiedTypeParameters(@NotNull FunctionDescriptor descriptor) { - for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) { - if (typeParameterDescriptor.isReified()) return true; - } - - return false; - } - public static boolean checkInlinableParameter( @NotNull CallableDescriptor parameter, @NotNull JetElement expression, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index aead1288169..6ab0a84e1dd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -470,4 +470,13 @@ public class DescriptorUtils { return false; } + + public static boolean containsReifiedTypeParameters(@NotNull CallableDescriptor descriptor) { + for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) { + if (typeParameterDescriptor.isReified()) return true; + } + + return false; + } + }