aboutsummaryrefslogtreecommitdiff
path: root/lldb
diff options
context:
space:
mode:
authorDmitri Gribenko <gribozavr@gmail.com>2024-08-22 13:24:15 +0200
committerDmitri Gribenko <gribozavr@gmail.com>2024-08-22 13:24:57 +0200
commitaa70f83e660453c006193aab7ba67c94db236948 (patch)
tree018acdf79c012dad76d9395e73259f0d3f6556af /lldb
parent7323e7eee3a819e9a2d8ec29f00d362bcad87731 (diff)
downloadllvm-aa70f83e660453c006193aab7ba67c94db236948.zip
llvm-aa70f83e660453c006193aab7ba67c94db236948.tar.gz
llvm-aa70f83e660453c006193aab7ba67c94db236948.tar.bz2
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.
Diffstat (limited to 'lldb')
-rw-r--r--lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/Makefile3
-rw-r--r--lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py29
-rw-r--r--lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/main.cpp13
-rw-r--r--lldb/tools/lldb-dap/JSONUtils.cpp3
4 files changed, 0 insertions, 48 deletions
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 99998b2..0000000
--- 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 1e41e84..0000000
--- 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 7194452..0000000
--- 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 c080fd3..a8b85f5 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));
}