fixup! check source file/line to determine if we want to hide a frame

Author: Michael137

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

@@ -188,12 +188,27 @@ class SwiftHiddenFrameRecognizer : public StackFrameRecognizer {
   RecognizeFrame(lldb::StackFrameSP frame_sp) override {
     if (!frame_sp)
       return {};
+
+    // Hide compiler-generated frames.
+    if (frame_sp->IsArtificial())
+      return m_hidden_frame;
+
     const auto &sc = frame_sp->GetSymbolContext(lldb::eSymbolContextFunction);
     if (!sc.function)
       return {};
 
+    FileSpec source_file;
+    uint32_t line_no;
+    sc.function->GetStartLineSourceInfo(source_file, line_no);
+    // FIXME: these <compiler-generated> frames should be marked artificial
+    // by the Swift compiler.
+    if (source_file.GetFilename() == "<compiler-generated>"
+        && line_no == 0)
+      return m_hidden_frame;
+
     auto symbol_name =
         sc.function->GetMangled().GetMangledName().GetStringRef();
+
     using namespace swift::Demangle;
     using namespace swift_demangle;
     Context demangle_ctx;

lldb/source/Target/VerboseTrapFrameRecognizer.cpp

@@ -45,15 +45,7 @@ static StackFrameSP FindMostRelevantFrame(Thread &selected_thread) {
     // frame. But that could still be in the `std` namespace, so
     // check the namespace prefix too.
     if (!frame_name.GetStringRef().starts_with("std::") &&
-        !most_relevant_frame_sp->IsHidden()
-#ifdef LLDB_ENABLE_SWIFT
-        // In Swift-C++ interop, we generate frames with a "std."
-        // prefix for functions from libc++. We don't want to
-        // stop in those frames either.
-        && !frame_name.GetStringRef().starts_with("__C.std.") &&
-        !frame_name.GetStringRef().starts_with("std.")
-#endif
-    )
+        !most_relevant_frame_sp->IsHidden())
       return most_relevant_frame_sp;
 
     ++stack_idx;