Merge pull request #11488 from swiftlang/lldb/diagnostic-crash-fix-to-6.2

adrian-prantl · web-flow · commit f9c51ffcd1e4 · 2025-09-29T12:30:10.000-07:00
🍒 [lldb][ClangExpressionParser] Reset DiagnosticManager before we create persistent variables
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -1298,6 +1298,10 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,
   m_compiler->setSema(nullptr);
 
   adapter->EndSourceFile();
+  // Creating persistent variables can trigger diagnostic emission.
+  // Make sure we reset the manager so we don't get asked to handle
+  // diagnostics after we finished parsing.
+  adapter->ResetManager();
 
   unsigned num_errors = adapter->getNumErrors();
 
@@ -1313,8 +1317,6 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,
     type_system_helper->CommitPersistentDecls();
   }
 
-  adapter->ResetManager();
-
   return num_errors;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1298,6 +1298,10 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,`
`1298`	`1298`	`m_compiler->setSema(nullptr);`
`1299`	`1299`
`1300`	`1300`	`adapter->EndSourceFile();`
	`1301`	`+ // Creating persistent variables can trigger diagnostic emission.`
	`1302`	`+ // Make sure we reset the manager so we don't get asked to handle`
	`1303`	`+ // diagnostics after we finished parsing.`
	`1304`	`+ adapter->ResetManager();`
`1301`	`1305`
`1302`	`1306`	`unsigned num_errors = adapter->getNumErrors();`
`1303`	`1307`
`@@ -1313,8 +1317,6 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,`
`1313`	`1317`	`type_system_helper->CommitPersistentDecls();`
`1314`	`1318`	`}`
`1315`	`1319`
`1316`		`- adapter->ResetManager();`
`1317`		`-`
`1318`	`1320`	`return num_errors;`
`1319`	`1321`	`}`
`1320`	`1322`