Creating an enum for exception breakpoint kinds (catch, throw) instead of a bool.

Author: ashgti

lldb/tools/lldb-dap/DAP.cpp

@@ -9,6 +9,7 @@
 #include "DAP.h"
 #include "DAPLog.h"
 #include "EventHelper.h"
+#include "ExceptionBreakpoint.h"
 #include "Handler/RequestHandler.h"
 #include "Handler/ResponseHandler.h"
 #include "JSONUtils.h"
@@ -131,28 +132,28 @@ void DAP::PopulateExceptionBreakpoints() {
   if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeC_plus_plus)) {
     exception_breakpoints.emplace_back(*this, "cpp_catch", "C++ Catch",
                                        lldb::eLanguageTypeC_plus_plus,
-                                       /*is_throw=*/false, /*is_catch=*/true);
+                                       eExceptionKindCatch);
     exception_breakpoints.emplace_back(*this, "cpp_throw", "C++ Throw",
                                        lldb::eLanguageTypeC_plus_plus,
-                                       /*is_throw=*/true, /*is_catch=*/false);
+                                       eExceptionKindThrow);
   }
 
   if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeObjC)) {
     exception_breakpoints.emplace_back(*this, "objc_catch", "Objective-C Catch",
                                        lldb::eLanguageTypeObjC,
-                                       /*is_throw=*/false, /*is_catch=*/true);
+                                       eExceptionKindCatch);
     exception_breakpoints.emplace_back(*this, "objc_throw", "Objective-C Throw",
                                        lldb::eLanguageTypeObjC,
-                                       /*is_throw=*/true, /*is_catch=*/false);
+                                       eExceptionKindThrow);
   }
 
   if (lldb::SBDebugger::SupportsLanguage(lldb::eLanguageTypeSwift)) {
     exception_breakpoints.emplace_back(*this, "swift_catch", "Swift Catch",
                                        lldb::eLanguageTypeSwift,
-                                       /*is_throw=*/false, /*is_catch=*/true);
+                                       eExceptionKindCatch);
     exception_breakpoints.emplace_back(*this, "swift_throw", "Swift Throw",
                                        lldb::eLanguageTypeSwift,
-                                       /*is_throw=*/true, /*is_catch=*/false);
+                                       eExceptionKindThrow);
   }
 
   // Besides handling the hardcoded list of languages from above, we try to find
@@ -184,7 +185,7 @@ void DAP::PopulateExceptionBreakpoints() {
       exception_breakpoints.emplace_back(
           *this, raw_lang_name + "_" + throw_keyword,
           capitalized_lang_name + " " + capitalize(throw_keyword), lang,
-          /*is_throw=*/true, /*is_catch=*/false);
+          eExceptionKindThrow);
     }
 
     if (lldb::SBLanguageRuntime::SupportsExceptionBreakpointsOnCatch(lang)) {
@@ -196,7 +197,7 @@ void DAP::PopulateExceptionBreakpoints() {
       exception_breakpoints.emplace_back(
           *this, raw_lang_name + "_" + catch_keyword,
           capitalized_lang_name + " " + capitalize(catch_keyword), lang,
-          /*is_throw=*/true, /*is_catch=*/false);
+          eExceptionKindCatch);
     }
   }
 }

lldb/tools/lldb-dap/ExceptionBreakpoint.cpp

@@ -24,8 +24,9 @@ protocol::Breakpoint ExceptionBreakpoint::SetBreakpoint(StringRef condition) {
   std::lock_guard<lldb::SBMutex> guard(lock);
 
   if (!m_bp.IsValid()) {
-    m_bp = m_dap.target.BreakpointCreateForException(m_language, m_is_catch,
-                                                     m_is_throw);
+    m_bp = m_dap.target.BreakpointCreateForException(
+        m_language, m_kind == eExceptionKindCatch,
+        m_kind == eExceptionKindThrow);
     m_bp.AddName(BreakpointBase::kDAPBreakpointLabel);
   }
 

lldb/tools/lldb-dap/ExceptionBreakpoint.h

@@ -19,12 +19,17 @@
 
 namespace lldb_dap {
 
+enum ExceptionKind : unsigned {
+  eExceptionKindCatch,
+  eExceptionKindThrow,
+};
+
 class ExceptionBreakpoint {
 public:
   ExceptionBreakpoint(DAP &d, std::string f, std::string l,
-                      lldb::LanguageType lang, bool is_throw, bool is_catch)
+                      lldb::LanguageType lang, ExceptionKind kind)
       : m_dap(d), m_filter(std::move(f)), m_label(std::move(l)),
-        m_language(lang), m_is_throw(is_throw), m_is_catch(is_catch), m_bp() {}
+        m_language(lang), m_kind(kind), m_bp() {}
 
   protocol::Breakpoint SetBreakpoint() { return SetBreakpoint(""); };
   protocol::Breakpoint SetBreakpoint(llvm::StringRef condition);
@@ -41,8 +46,7 @@ class ExceptionBreakpoint {
   std::string m_filter;
   std::string m_label;
   lldb::LanguageType m_language;
-  bool m_is_throw;
-  bool m_is_catch;
+  ExceptionKind m_kind;
   lldb::SBBreakpoint m_bp;
 };