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

JVM Backend: always inline callable containing reified TP

Browse Source
This commit is contained in:
Denis Zharkov
2014-12-08 18:31:47 +03:00
committed by Alexander Udalov
parent b86e19782c
commit abbcf61183
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+3 -1
View File
@@ -2283,7 +2283,9 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
) { ) {
if (callElement == null) return defaultCallGenerator; if (callElement == null) return defaultCallGenerator;
boolean isInline = state.isInlineEnabled() && // We should inline callable containing reified type parameters even if inline is disabled
// because they may contain something to reify and straight call will probably fail at runtime
boolean isInline = (state.isInlineEnabled() || DescriptorUtils.containsReifiedTypeParameters(descriptor)) &&
descriptor instanceof SimpleFunctionDescriptor && descriptor instanceof SimpleFunctionDescriptor &&
((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline(); ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline();