Merge pull request swiftlang#11357 from adrian-prantl/repl-dwarf4

adrian-prantl · web-flow · commit 50c5a1c6da42 · 2025-09-09T12:51:56.000-07:00
[LLDB] Clamp the ClangImporter DWARF version to 4
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -3053,7 +3053,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(
       ci_args.push_back(sdk_triple.str());
     }
     ci_args.push_back("-gmodules");
-    ci_args.push_back("-g");
+    ci_args.push_back("-gdwarf-4");
   }
 
   std::vector<swift::PluginSearchOption> plugin_search_options;
@@ -3192,7 +3192,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(
       swift_ast_sp->RegisterSectionModules(*image_sp, module_names);
   }
 
-  {
+  if (!for_expressions && module_sp) {
     auto ast_context = swift_ast_sp->GetASTContext();
     if (!ast_context) {
       logError("couldn't initialize Swift compiler");

Original file line number	Diff line number	Diff line change
`@@ -3053,7 +3053,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(`
`3053`	`3053`	`ci_args.push_back(sdk_triple.str());`
`3054`	`3054`	`}`
`3055`	`3055`	`ci_args.push_back("-gmodules");`
`3056`		`- ci_args.push_back("-g");`
	`3056`	`+ ci_args.push_back("-gdwarf-4");`
`3057`	`3057`	`}`
`3058`	`3058`
`3059`	`3059`	`std::vector<swift::PluginSearchOption> plugin_search_options;`
`@@ -3192,7 +3192,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(`
`3192`	`3192`	`swift_ast_sp->RegisterSectionModules(*image_sp, module_names);`
`3193`	`3193`	`}`
`3194`	`3194`
`3195`		`- {`
	`3195`	`+ if (!for_expressions && module_sp) {`
`3196`	`3196`	`auto ast_context = swift_ast_sp->GetASTContext();`
`3197`	`3197`	`if (!ast_context) {`
`3198`	`3198`	`logError("couldn't initialize Swift compiler");`