[Lldb-commits] [lldb] Reapply PR/87550 (PR #94625)

Jonas Devlieghere via lldb-commits lldb-commits at lists.llvm.org
Fri Jun 7 08:21:18 PDT 2024


================
@@ -59,25 +59,29 @@ DAP::DAP()
 DAP::~DAP() = default;
 
 void DAP::PopulateExceptionBreakpoints() {
-  exception_breakpoints = {};
-  if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeC_plus_plus)) {
-    exception_breakpoints->emplace_back("cpp_catch", "C++ Catch",
-                                        lldb::eLanguageTypeC_plus_plus);
-    exception_breakpoints->emplace_back("cpp_throw", "C++ Throw",
-                                        lldb::eLanguageTypeC_plus_plus);
-  }
-  if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeObjC)) {
-    exception_breakpoints->emplace_back("objc_catch", "Objective-C Catch",
-                                        lldb::eLanguageTypeObjC);
-    exception_breakpoints->emplace_back("objc_throw", "Objective-C Throw",
-                                        lldb::eLanguageTypeObjC);
-  }
-  if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeSwift)) {
-    exception_breakpoints->emplace_back("swift_catch", "Swift Catch",
-                                        lldb::eLanguageTypeSwift);
-    exception_breakpoints->emplace_back("swift_throw", "Swift Throw",
-                                        lldb::eLanguageTypeSwift);
-  }
+  if (exception_breakpoints.has_value())
+    return;
----------------
JDevlieghere wrote:

The `call_once` is already going to guarantee that this isn't called more than once, so this check is redundant. 

https://github.com/llvm/llvm-project/pull/94625


More information about the lldb-commits mailing list