[Lldb-commits] [lldb] aa70f83 - Revert "[lldb-dap] Mark hidden frames as "subtle" (#105457)"

[Dmitri Gribenko via lldb-commits]

Author: Dmitri Gribenko
Date: 2024-08-22T13:24:57+02:00
New Revision: aa70f83e660453c006193aab7ba67c94db236948

URL: https://github.com/llvm/llvm-project/commit/aa70f83e660453c006193aab7ba67c94db236948
DIFF: https://github.com/llvm/llvm-project/commit/aa70f83e660453c006193aab7ba67c94db236948.diff

LOG: Revert "[lldb-dap] Mark hidden frames as "subtle" (#105457)"

This reverts commit 6f456024c37424d9c8cc1cea07126a28f246588d, which
depends on https://github.com/llvm/llvm-project/pull/104523, which I'm
reverting.

Added: 
    

Modified: 
    lldb/tools/lldb-dap/JSONUtils.cpp

Removed: 
    lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/Makefile
    lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
    lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/main.cpp


################################################################################
diff  --git a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/Makefile b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/Makefile
deleted file mode 100644
index 99998b20bcb050..00000000000000
--- a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-CXX_SOURCES := main.cpp
-
-include Makefile.rules

diff  --git a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
deleted file mode 100644
index 1e41e841e39bc8..00000000000000
--- a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Test lldb-dap stack trace response
-"""
-
-
-import dap_server
-from lldbsuite.test.decorators import *
-
-import lldbdap_testcase
-from lldbsuite.test.lldbtest import *
-
-
-class TestDAP_subtleFrames(lldbdap_testcase.DAPTestCaseBase):
-    @add_test_categories(["libc++"])
-    def test_subtleFrames(self):
-        """
-        Internal stack frames (such as the ones used by `std::function`) are marked as "subtle".
-        """
-        program = self.getBuildArtifact("a.out")
-        self.build_and_launch(program)
-        source = "main.cpp"
-        self.set_source_breakpoints(source, [line_number(source, "BREAK HERE")])
-        self.continue_to_next_stop()
-
-        frames = self.get_stackFrames()
-        for f in frames:
-            if "__function" in f["name"]:
-                self.assertEqual(f["presentationHint"], "subtle")
-        self.assertTrue(any(f.get("presentationHint") == "subtle" for f in frames))

diff  --git a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/main.cpp b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/main.cpp
deleted file mode 100644
index 71944528441e38..00000000000000
--- a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/main.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <functional>
-#include <iostream>
-
-void greet() {
-  // BREAK HERE
-  std::cout << "Hello\n";
-}
-
-int main() {
-  std::function<void()> func{greet};
-  func();
-  return 0;
-}

diff  --git a/lldb/tools/lldb-dap/JSONUtils.cpp b/lldb/tools/lldb-dap/JSONUtils.cpp
index c080fd395b7288..a8b85f55939e17 100644
--- a/lldb/tools/lldb-dap/JSONUtils.cpp
+++ b/lldb/tools/lldb-dap/JSONUtils.cpp
@@ -763,9 +763,6 @@ llvm::json::Value CreateStackFrame(lldb::SBFrame &frame) {
     object.try_emplace("instructionPointerReference", formatted_addr);
   }
 
-  if (frame.IsArtificial() || frame.IsHidden())
-    object.try_emplace("presentationHint", "subtle");
-
   return llvm::json::Value(std::move(object));
 }