Merge pull request #3716 from adrian-prantl/cherry-pick56

Cherry picks

Author: adrian-prantl

lldb/include/lldb/Expression/UserExpression.h

@@ -266,10 +266,8 @@ class UserExpression : public Expression {
       0x1001; ///< ValueObject::GetError() returns this if there is no result
               /// from the expression.
 
-  const char *GetFixedText() {
-    if (m_fixed_text.empty())
-      return nullptr;
-    return m_fixed_text.c_str();
+  llvm::StringRef GetFixedText() {
+    return m_fixed_text;
   }
 
 protected:

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

@@ -708,6 +708,20 @@ ifneq "$(DYLIB_HIDE_SWIFTMODULE)" ""
             -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ \
             $(patsubst %.swiftmodule.o,,$(DYLIB_OBJECTS))
 else
+ifneq "$(FRAMEWORK)" ""
+	mkdir -p $(FRAMEWORK).framework/Versions/A/Headers
+	mkdir -p $(FRAMEWORK).framework/Versions/A/Modules
+	mkdir -p $(FRAMEWORK).framework/Versions/A/Resources
+ifneq "$(MODULENAME)" ""
+	mkdir -p $(FRAMEWORK).framework/Versions/A/Modules/$(MODULENAME).swiftmodule
+	cp -r $(MODULENAME).swiftmodule $(FRAMEWORK).framework/Versions/A/Modules/$(MODULENAME).swiftmodule/$(ARCH).swiftmodule
+endif
+	(cd $(FRAMEWORK).framework/Versions; ln -sf A Current)
+	(cd $(FRAMEWORK).framework/; ln -sf Versions/A/Headers Headers)
+	(cd $(FRAMEWORK).framework/; ln -sf Versions/A/Modules Modules)
+	(cd $(FRAMEWORK).framework/; ln -sf Versions/A/Resources Resources)
+	(cd $(FRAMEWORK).framework/; ln -sf Versions/A/$(FRAMEWORK) $(FRAMEWORK))
+endif
 	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) \
             -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ $(DYLIB_OBJECTS)
 endif

lldb/source/Expression/UserExpression.cpp

@@ -262,9 +262,13 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
   if (fixed_expression == nullptr)
     fixed_expression = &tmp_fixed_expression;
 
-  const char *fixed_text = user_expression_sp->GetFixedText();
-  if (fixed_text != nullptr)
-    fixed_expression->append(fixed_text);
+  *fixed_expression = user_expression_sp->GetFixedText().str();
+
+  // Swift Playgrounds disable fixits, but SwiftASTContext may get
+  // poisoned (see SwiftASTContextForExpressions::ModulesDidLoad())
+  // during expression evaluation. When this happens we want to re-run
+  // the same expression with a freshly initialized SwiftASTContext.
+  bool is_replay = !options.GetAutoApplyFixIts() && expr == *fixed_expression;
 
   // If there is a fixed expression, try to parse it:
   if (!parse_success) {
@@ -273,9 +277,9 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
     user_expression_sp.reset();
 
     execution_results = lldb::eExpressionParseError;
-    if (fixed_expression && !fixed_expression->empty() &&
-        options.GetAutoApplyFixIts()) {
-      const uint64_t max_fix_retries = options.GetRetriesWithFixIts();
+    if (!fixed_expression->empty() &&
+        (options.GetAutoApplyFixIts() || is_replay)) {
+      const uint64_t max_fix_retries = is_replay ? 1 : options.GetRetriesWithFixIts();
       for (uint64_t i = 0; i < max_fix_retries; ++i) {
         // Try parsing the fixed expression.
         lldb::UserExpressionSP fixed_expression_sp(
@@ -293,8 +297,8 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
         } else {
           // The fixed expression also didn't parse. Let's check for any new
           // Fix-Its we could try.
-          if (fixed_expression_sp->GetFixedText()) {
-            *fixed_expression = fixed_expression_sp->GetFixedText();
+          if (!fixed_expression_sp->GetFixedText().empty()) {
+            *fixed_expression = fixed_expression_sp->GetFixedText().str();
           } else {
             // Fixed expression didn't compile without a fixit, don't retry and
             // don't tell the user about it.

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

@@ -1221,10 +1221,18 @@ struct SwiftASTContextError : public llvm::ErrorInfo<SwiftASTContextError> {
 /// This indicates an error in the SwiftASTContext.
 struct ModuleImportError : public llvm::ErrorInfo<ModuleImportError> {
   static char ID;
-  std::string Message;
-
-  ModuleImportError(llvm::Twine Message) : Message(Message.str()) {}
-  void log(llvm::raw_ostream &OS) const override { OS << "ModuleImport"; }
+  std::string msg;
+  bool is_explicit;
+
+  ModuleImportError(llvm::Twine message, bool is_explicit = false)
+      : msg(message.str()), is_explicit(is_explicit) {}
+  void log(llvm::raw_ostream &OS) const override {
+    if (is_explicit)
+      OS << "error while processing import statement:";
+    else
+      OS << "error while importing implicit dependency:";
+    OS << msg;
+  }
   std::error_code convertToErrorCode() const override {
     return inconvertibleErrorCode();
   }
@@ -1321,8 +1329,7 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
     const char *msg = implicit_import_error.AsCString();
     if (!msg)
       msg = "error status positive, but import still failed";
-    return make_error<ModuleImportError>(llvm::Twine("in implicit-import:\n") +
-                                         msg);
+    return make_error<ModuleImportError>(msg);
   }
 
   swift::ImplicitImportInfo importInfo;
@@ -1471,8 +1478,7 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
           const char *msg = auto_import_error.AsCString();
           if (!msg)
             msg = "error status positive, but import still failed";
-          return make_error<ModuleImportError>(
-              llvm::Twine("in user-import:\n") + msg);
+          return make_error<ModuleImportError>(msg, /*explicit=*/true);
     }
   }
 
@@ -1524,13 +1530,19 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
                      m_sc, *m_exe_scope, m_options, repl, playground);
 
   if (!parsed_expr) {
+    bool user_import = false;
     bool retry = false;
     handleAllErrors(parsed_expr.takeError(),
                     [&](const ModuleImportError &MIE) {
+                      if (MIE.is_explicit) {
+                        // A new dylib may have poisoned the context.
+                        retry = true;
+                        user_import = true;
+                      }
                       if (swift_ast_ctx->GetClangImporter())
                         // Already on backup power.
                         diagnostic_manager.PutString(eDiagnosticSeverityError,
-                                                     MIE.Message);
+                                                     MIE.message());
                       else
                         // Discard the shared scratch context and retry.
                         retry = true;
@@ -1552,7 +1564,8 @@ unsigned SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     // fresh SwiftASTContext initialized with the flags from the
     // current lldb::Module / Swift dylib to avoid header search
     // mismatches.
-    m_sc.target_sp->SetUseScratchTypesystemPerModule(true);
+    if (!user_import)
+      m_sc.target_sp->SetUseScratchTypesystemPerModule(true);
     return 2;
   }