Debug CI

Author: kastiglione

lldb/source/Plugins/Language/Swift/SwiftFrameRecognizers.cpp

@@ -242,7 +242,8 @@ class SwiftExceptionBreakpointFrameRecognizer : public StackFrameRecognizer {
 
       StringRef symbol_name;
       {
-        SymbolContext sc = m_frame_sp->GetSymbolContext(eSymbolContextSymbol);
+        const SymbolContext &sc =
+            m_frame_sp->GetSymbolContext(eSymbolContextSymbol);
         if (!sc.symbol)
           return {};
         symbol_name = sc.symbol->GetName();
@@ -260,7 +261,7 @@ class SwiftExceptionBreakpointFrameRecognizer : public StackFrameRecognizer {
 
       {
         // Check if source is available for the identified frame.
-        SymbolContext sc =
+        const SymbolContext &sc =
             relevant_frame_sp->GetSymbolContext(eSymbolContextCompUnit);
         if (!sc.comp_unit)
           return {};

lldb/source/Target/StackFrameRecognizer.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Target/StackFrameRecognizer.h"
+#include "lldb/Core/Mangled.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Symbol/Symbol.h"
@@ -141,7 +142,7 @@ StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
   Address start_addr = symbol->GetAddress();
   Address current_addr = frame->GetFrameCodeAddress();
 
-  for (auto entry : m_recognizers) {
+  for (const auto &entry : m_recognizers) {
     if (entry.module)
       if (entry.module != module_name)
         continue;
@@ -166,6 +167,14 @@ StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
 
     return entry.recognizer;
   }
+
+  LLDB_LOG(GetLog(LLDBLog::Symbols),
+           "Did not recognize frame: module={0} symbol={1]} mangled={2} "
+           "demangled={3}",
+           module_name, symbol->GetName(),
+           symctx.GetFunctionName(Mangled::ePreferMangled),
+           symctx.GetFunctionName(Mangled::ePreferDemangled));
+
   return StackFrameRecognizerSP();
 }
 

lldb/test/API/lang/swift/exception_breakpoint_recognizer/TestSwiftExceptionBreakpointRecognizer.py

@@ -11,18 +11,41 @@ def test(self):
         target = lldbutil.run_to_breakpoint_make_target(self)
         bp = target.BreakpointCreateForException(lldb.eLanguageTypeSwift, False, True)
 
+        log_file = self.getBuildArtifact("symbol.log")
+        self.runCmd("log enable lldb symbols -f {log_file}")
+
         # First breakpoint in an untyped throws function.
         _, process, _, _ = lldbutil.run_to_breakpoint_do_run(self, target, bp)
         thread = process.selected_thread
         stop_desc = thread.GetStopDescription(128)
         # self.assertEqual(stop_desc, "Swift exception breakpoint")
         self.assertEqual(thread.frame[0].symbol.name, "swift_willThrow")
-        self.assertEqual(thread.selected_frame.idx, 1)
+        # self.assertEqual(thread.selected_frame.idx, 1)
+        if thread.selected_frame.idx != 1:
+            r = lldb.SBCommandReturnObject()
+            self.ci.HandleCommand("frame recognizer list", r)
+            info = r.GetOutput()
+            r = lldb.SBCommandReturnObject()
+            self.ci.HandleCommand("frame recognizer info 0", r)
+            info += r.GetOutput()
+            with open(log_file) as f:
+                info += f.read()
+            self.assertIn("qowieoiuqweoiq", info)
 
         # Second breakpoint in an typed throws function.
         process.Continue()
         thread = process.selected_thread
         stop_desc = thread.GetStopDescription(128)
         # self.assertEqual(stop_desc, "Swift exception breakpoint")
         self.assertEqual(thread.frame[0].symbol.name, "swift_willThrowTypedImpl")
-        self.assertEqual(thread.selected_frame.idx, 2)
+        # self.assertEqual(thread.selected_frame.idx, 2)
+        if thread.selected_frame.idx != 2:
+            r = lldb.SBCommandReturnObject()
+            self.ci.HandleCommand("frame recognizer list", r)
+            info = r.GetOutput()
+            r = lldb.SBCommandReturnObject()
+            self.ci.HandleCommand("frame recognizer info 0", r)
+            info += r.GetOutput()
+            with open(log_file) as f:
+                info += f.read()
+            self.assertIn("qowieoiuqweoiq", info)