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

Use implementation part class for SMAP generation when inlining function both from binaries and sources.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-02-03 17:54:14 +03:00
parent 0a46033d40
commit b5145ea68b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
+3 -3
View File
@@ -213,7 +213,7 @@ public class InlineCodegen extends CallGenerator {
} }
nodeAndSMAP = InlineCodegenUtil.getMethodNode( nodeAndSMAP = InlineCodegenUtil.getMethodNode(
file.contentsToByteArray(), asmMethod.getName(), asmMethod.getDescriptor(), containingClasses.getFacadeClassId() file.contentsToByteArray(), asmMethod.getName(), asmMethod.getDescriptor(), containerId
); );
if (nodeAndSMAP == null) { if (nodeAndSMAP == null) {
@@ -241,7 +241,7 @@ public class InlineCodegen extends CallGenerator {
SMAP smap; SMAP smap;
if (callDefault) { if (callDefault) {
Type implementationOwner = typeMapper.mapOwner(functionDescriptor); Type implementationOwner = typeMapper.mapImplementationOwner(functionDescriptor);
FakeMemberCodegen parentCodegen = new FakeMemberCodegen(codegen.getParentCodegen(), inliningFunction, FakeMemberCodegen parentCodegen = new FakeMemberCodegen(codegen.getParentCodegen(), inliningFunction,
(FieldOwnerContext) methodContext.getParentContext(), (FieldOwnerContext) methodContext.getParentContext(),
implementationOwner.getInternalName()); implementationOwner.getInternalName());
@@ -366,7 +366,7 @@ public class InlineCodegen extends CallGenerator {
new FakeMemberCodegen(codegen.getParentCodegen(), expression, new FakeMemberCodegen(codegen.getParentCodegen(), expression,
(FieldOwnerContext) context.getParentContext(), (FieldOwnerContext) context.getParentContext(),
isLambda ? codegen.getParentCodegen().getClassName() isLambda ? codegen.getParentCodegen().getClassName()
: typeMapper.mapOwner(descriptor).getInternalName()); : typeMapper.mapImplementationOwner(descriptor).getInternalName());
FunctionGenerationStrategy strategy = FunctionGenerationStrategy strategy =
expression instanceof KtCallableReferenceExpression ? expression instanceof KtCallableReferenceExpression ?