From 5cb967180375649bcc60181a631f18affc97a3ee Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 18 May 2015 13:23:12 +0300
Subject: [PATCH] Support inlining in scripts and outer expression capturing

 #KT-7744 Fixed
---
 .../jetbrains/kotlin/codegen/MemberCodegen.java    | 11 +++++++++--
 .../codegen/binding/CodegenAnnotatingVisitor.java  |  2 +-
 .../kotlin/codegen/inline/InlineCodegen.java       |  9 +++++++++
 compiler/testData/codegen/script/inline.kts        | 14 ++++++++++++++
 compiler/testData/codegen/script/outerCapture.kts  | 14 ++++++++++++++
 .../kotlin/codegen/ScriptCodegenTestGenerated.java | 12 ++++++++++++
 6 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 compiler/testData/codegen/script/inline.kts
 create mode 100644 compiler/testData/codegen/script/outerCapture.kts

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 2084afdac6e..4ce453d8635 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -54,6 +54,7 @@ import java.util.*;
 
 import static org.jetbrains.kotlin.codegen.AsmUtil.calculateInnerClassAccessFlags;
 import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor;
 import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED;
 import static org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE;
 import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE;
@@ -242,8 +243,12 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
 
     private void writeInnerClass(@NotNull ClassDescriptor innerClass) {
         DeclarationDescriptor containing = innerClass.getContainingDeclaration();
-        String outerClassInternalName =
-                containing instanceof ClassDescriptor ? typeMapper.mapClass((ClassDescriptor) containing).getInternalName() : null;
+        String outerClassInternalName = null;
+        if (containing instanceof ClassDescriptor) {
+            outerClassInternalName = typeMapper.mapClass((ClassDescriptor) containing).getInternalName();
+        } else if (containing instanceof ScriptDescriptor) {
+            outerClassInternalName = asmTypeForScriptDescriptor(bindingContext, (ScriptDescriptor) containing).getInternalName();
+        }
 
         String innerName = innerClass.getName().isSpecial() ? null : innerClass.getName().asString();
 
@@ -280,6 +285,8 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         }
         else if (outermost instanceof PackageContext && !(outermost instanceof PackageFacadeContext)) {
             return PackagePartClassUtils.getPackagePartType(element.getContainingJetFile());
+        } else if (outermost instanceof ScriptContext) {
+            return asmTypeForScriptDescriptor(bindingContext, ((ScriptContext) outermost).getScriptDescriptor());
         }
         return null;
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
index 6abc8f1b768..91eca199be0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
@@ -371,7 +371,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
 
         String peek = peekFromStack(nameStack);
         String name = safeIdentifier(descriptor.getName()).asString();
-        if (containingDeclaration instanceof ClassDescriptor) {
+        if (containingDeclaration instanceof ClassDescriptor || containingDeclaration instanceof ScriptDescriptor) {
             return peek + '$' + name;
         }
         else if (containingDeclaration instanceof PackageFragmentDescriptor) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
index 1c755ed03a6..112329cbaa6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
@@ -58,6 +58,7 @@ import java.util.*;
 
 import static org.jetbrains.kotlin.codegen.AsmUtil.getMethodAsmFlags;
 import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
+import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT;
 import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.addInlineMarker;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isFunctionLiteral;
 import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert;
@@ -574,6 +575,14 @@ public class InlineCodegen extends CallGenerator {
             OwnerKind kind = DescriptorUtils.isTrait(descriptor) ? OwnerKind.TRAIT_IMPL : OwnerKind.IMPLEMENTATION;
             return parent.intoClass((ClassDescriptor) descriptor, kind, state);
         }
+        else if (descriptor instanceof ScriptDescriptor) {
+            ClassDescriptor classDescriptorForScript = state.getBindingContext().get(CLASS_FOR_SCRIPT, (ScriptDescriptor) descriptor);
+            assert classDescriptorForScript != null : "Can't find class for script: " + descriptor;
+            List<ScriptDescriptor> earlierScripts = state.getEarlierScriptsForReplInterpreter();
+            return parent.intoScript((ScriptDescriptor) descriptor,
+                                     earlierScripts == null ? Collections.emptyList() : earlierScripts,
+                                     classDescriptorForScript);
+        }
         else if (descriptor instanceof FunctionDescriptor) {
             return parent.intoFunction((FunctionDescriptor) descriptor);
         }
diff --git a/compiler/testData/codegen/script/inline.kts b/compiler/testData/codegen/script/inline.kts
new file mode 100644
index 00000000000..6de32d8f42d
--- /dev/null
+++ b/compiler/testData/codegen/script/inline.kts
@@ -0,0 +1,14 @@
+// expected: rv: 2
+@inline fun foo(l: (Int) -> Int ): Int {
+    return l(1)
+}
+
+fun bar(p: Int): Int {
+    return p + 1
+}
+
+fun main(): Int {
+    return foo { x -> bar(x) }
+}
+
+main()
\ No newline at end of file
diff --git a/compiler/testData/codegen/script/outerCapture.kts b/compiler/testData/codegen/script/outerCapture.kts
new file mode 100644
index 00000000000..ab5b9e9520a
--- /dev/null
+++ b/compiler/testData/codegen/script/outerCapture.kts
@@ -0,0 +1,14 @@
+// expected: rv: 2
+fun foo(l: (Int) -> Int ): Int {
+    return l(1)
+}
+
+fun bar(p: Int): Int {
+    return p + 1
+}
+
+fun main(): Int {
+    return foo { x -> bar(x) }
+}
+
+main()
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
index aee1afce3a4..19c990e9b47 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java
@@ -47,6 +47,18 @@ public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
         doTest(fileName);
     }
 
+    @TestMetadata("inline.kts")
+    public void testInline() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/inline.kts");
+        doTest(fileName);
+    }
+
+    @TestMetadata("outerCapture.kts")
+    public void testOuterCapture() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/outerCapture.kts");
+        doTest(fileName);
+    }
+
     @TestMetadata("parameter.kts")
     public void testParameter() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameter.kts");