Revert debugging code

Author: kastiglione

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

@@ -2543,7 +2543,8 @@ DWARFASTParserClang::ParseFunctionFromDWARF(CompileUnit &comp_unit,
       // If the mangled name is not present in the DWARF, generate the
       // demangled name using the decl context. We skip if the function is
       // "main" as its name is never mangled.
-      func_name.SetValue(ConstructDemangledNameFromDWARF(die));
+      func_name.SetDemangledName(ConstructDemangledNameFromDWARF(die));
+      func_name.SetMangledName(ConstString(name));
     } else
       func_name.SetValue(ConstString(name));
 

lldb/source/Target/StackFrameRecognizer.cpp

@@ -142,7 +142,7 @@ StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
   Address start_addr = symbol->GetAddress();
   Address current_addr = frame->GetFrameCodeAddress();
 
-  for (const auto &entry : m_recognizers) {
+  for (auto entry : m_recognizers) {
     if (entry.module)
       if (entry.module != module_name)
         continue;
@@ -151,8 +151,7 @@ StackFrameRecognizerManager::GetRecognizerForFrame(StackFrameSP frame) {
       if (!entry.module_regexp->Execute(module_name.GetStringRef()))
         continue;
 
-    ConstString function_name =
-        symbol->GetMangled().GetName(entry.symbol_mangling);
+    ConstString function_name = symctx.GetFunctionName(entry.symbol_mangling);
 
     if (!entry.symbols.empty())
       if (!llvm::is_contained(entry.symbols, function_name))
@@ -168,14 +167,6 @@ 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,43 +11,18 @@ 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(f"log enable lldb symbol -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(stop_desc, "Swift exception breakpoint")
         self.assertEqual(thread.frame[0].symbol.name, "swift_willThrow")
-        # 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:
-                log_lines = f.readlines()
-            info += "".join(line for line in log_lines if "recognize" in line)
-            self.assertIn("qowieoiuqweoiq", info)
+        self.assertEqual(thread.selected_frame.idx, 1)
 
         # 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(stop_desc, "Swift exception breakpoint")
         self.assertEqual(thread.frame[0].symbol.name, "swift_willThrowTypedImpl")
-        # 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:
-                log_lines = f.readlines()
-            info += "".join(line for line in log_lines if "recognize" in line)
-            self.assertIn("qowieoiuqweoiq", info)
+        self.assertEqual(thread.selected_frame.idx, 2)