Merge pull request #11479 from swiftlang/lldb/diagnostic-crash-fix-to-21.x

Michael137 · web-flow · commit 192902ca4f5c · 2025-09-23T13:05:05.000+01: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
@@ -1352,6 +1352,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();
 
@@ -1367,8 +1371,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
`@@ -1352,6 +1352,10 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,`
`1352`	`1352`	`m_compiler->setSema(nullptr);`
`1353`	`1353`
`1354`	`1354`	`adapter->EndSourceFile();`
	`1355`	`+ // Creating persistent variables can trigger diagnostic emission.`
	`1356`	`+ // Make sure we reset the manager so we don't get asked to handle`
	`1357`	`+ // diagnostics after we finished parsing.`
	`1358`	`+ adapter->ResetManager();`
`1355`	`1359`
`1356`	`1360`	`unsigned num_errors = adapter->getNumErrors();`
`1357`	`1361`
`@@ -1367,8 +1371,6 @@ ClangExpressionParser::ParseInternal(DiagnosticManager &diagnostic_manager,`
`1367`	`1371`	`type_system_helper->CommitPersistentDecls();`
`1368`	`1372`	`}`
`1369`	`1373`
`1370`		`- adapter->ResetManager();`
`1371`		`-`
`1372`	`1374`	`return num_errors;`
`1373`	`1375`	`}`
`1374`	`1376`