commit ef2d0c6d9149a049b57ead6bb1902c7d309f61d8
author Nikolay Egorov <nikolay.egorov@jetbrains.com> Fri May 13 11:43:24 2022 +0300
committer Nikolay Egorov <nikolay.egorov@jetbrains.com> Mon May 23 09:33:37 2022 +0300
tree 008ac9268e433c9c2f25a3d0dd0da27c31087209
parent fcbc6b84598bef4d4ca95c593070c2a5cba1da35

Fix codegen in scripts during evaluation of expressions

compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 1ec3123..56aecde 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -3046,7 +3046,9 @@
             }
         }
         else if (receiverDescriptor instanceof ScriptDescriptor) {
-            return generateScriptReceiver((ScriptDescriptor) receiverDescriptor);
+            StackValue ans = generateScriptReceiver((ScriptDescriptor) receiverDescriptor);
+
+            return ans != null ? ans : StackValue.thisOrOuter(this, receiverDescriptor, isSuper, castReceiver);
         }
         else {
             return StackValue.thisOrOuter(this, receiverDescriptor, isSuper, castReceiver);
@@ -3126,7 +3128,6 @@
         return result;
     }
 
-    @NotNull
     private StackValue generateScriptReceiver(@NotNull ScriptDescriptor receiver) {
         CodegenContext cur = context;
         StackValue result = StackValue.LOCAL_0;
@@ -3150,7 +3151,7 @@
                 return StackValue.field(classType, receiverKotlinType, currentScriptType, fieldName, false, result, receiver);
             }
 
-            result = cur.getOuterExpression(result, false);
+            result = cur.getOuterExpression(result, true);
 
             if (inStartConstructorContext) {
                 cur = getNotNullParentContextForMethod(cur);
@@ -3160,7 +3161,7 @@
             cur = cur.getParentContext();
         }
 
-        throw new UnsupportedOperationException();
+        return result;
     }
 
     @NotNull