Merge pull request #3043 from CodaFi/closing-time

[Swift 5.5] Special-case Pattern Binding Decls Created by LLDB

Author: CodaFi

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp

@@ -432,7 +432,7 @@ swift::Stmt *SwiftASTManipulator::ConvertExpressionToTmpReturnVarAccess(
                                           result_loc_info.tmp_var_decl);
 
   const auto static_spelling_kind = swift::StaticSpellingKind::KeywordStatic;
-  result_loc_info.binding_decl = swift::PatternBindingDecl::createImplicit(
+  result_loc_info.binding_decl = swift::PatternBindingDecl::createForDebugger(
       ast_context, static_spelling_kind, var_pattern, expr, new_decl_context);
   result_loc_info.binding_decl->setStatic(false);
 
@@ -445,8 +445,12 @@ swift::Stmt *SwiftASTManipulator::ConvertExpressionToTmpReturnVarAccess(
     body.push_back(result_loc_info.return_stmt);
   }
 
+  swift::SourceLoc brace_end = result_loc_info.orig_expr->getEndLoc();
+  if (brace_end.isInvalid()) {
+    brace_end = source_loc;
+  }
   auto *body_stmt = swift::BraceStmt::create(
-      ast_context, source_loc, llvm::ArrayRef<swift::ASTNode>(body), source_loc,
+      ast_context, source_loc, llvm::ArrayRef<swift::ASTNode>(body), brace_end,
       true);
 
   // Default construct a label info that contains nothing for the 'do'

lldb/test/API/lang/swift/expression/scopes/main.swift

@@ -131,6 +131,9 @@ func main () -> Void
     var my_b = B()
 
     my_b.method()
+
+    let my_c = [1, 2, 3].map { x in x }
+    print(my_c)
 }
 
 main()

lldb/test/Shell/SwiftREPL/ClosureScope.test

@@ -0,0 +1,18 @@
+// Test that we can define and use variables in closure scopes in the REPL
+// REQUIRES: swift
+
+// RUN: %lldb --repl < %s | FileCheck %s
+
+print([1, 2, 3].map { x in x + 1 })
+// CHECK: [2, 3, 4]
+
+var numbers = [20, 17, 2, 7]
+print(numbers.map({ (number: Int) -> Int in return 3 * number }))
+// CHECK: numbers: [Int] = 4 values {
+// CHECK:  [0] = 20
+// CHECK:  [1] = 17
+// CHECK:  [2] = 2
+// CHECK:  [3] = 7
+// CHECK: }
+// CHECK: [60, 51, 6, 21]
+