[lldb] [llvm] [LLDB] Switch to using DIL as default implementation for 'frame var'. (PR #147887)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 15 07:58:03 PDT 2025
https://github.com/cmtice updated https://github.com/llvm/llvm-project/pull/147887
>From 3dbe09deb36a44eb056fa2d3d7dacd341e391697 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice at google.com>
Date: Wed, 9 Jul 2025 20:42:03 -0700
Subject: [PATCH 1/4] [LLDB] Switch to using DIL as default implementation for
'frame var'.
---
lldb/source/Target/TargetProperties.td | 4 ++--
llvm/docs/ReleaseNotes.md | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lldb/source/Target/TargetProperties.td b/lldb/source/Target/TargetProperties.td
index 4aa9e046d6077..656503bb8d228 100644
--- a/lldb/source/Target/TargetProperties.td
+++ b/lldb/source/Target/TargetProperties.td
@@ -5,8 +5,8 @@ let Definition = "target_experimental" in {
Global, DefaultTrue,
Desc<"If true, inject local variables explicitly into the expression text. This will fix symbol resolution when there are name collisions between ivars and local variables. But it can make expressions run much more slowly.">;
def UseDIL : Property<"use-DIL", "Boolean">,
- Global, DefaultFalse,
- Desc<"If true, use the alternative DIL implementation for frame variable evaluation.">;
+ Global, DefaultTrue,
+ Desc<"If true, use the DIL implementation for frame variable evaluation.">;
}
let Definition = "target" in {
diff --git a/llvm/docs/ReleaseNotes.md b/llvm/docs/ReleaseNotes.md
index daf822388a2ff..5d2146b7f2f75 100644
--- a/llvm/docs/ReleaseNotes.md
+++ b/llvm/docs/ReleaseNotes.md
@@ -306,6 +306,14 @@ Changes to LLDB
stop reason = SIGSEGV: sent by tkill system call (sender pid=649752, uid=2667987)
```
* ELF Cores can now have their siginfo structures inspected using `thread siginfo`.
+* LLDB now uses
+ [DIL](https://discourse.llvm.org/t/rfc-data-inspection-language/69893) as the
+ default implementation for 'frame variable'. This should not change the
+ behavior of 'frame variable' at all, at this time. To revert to using the
+ old implementation use
+ ```
+ settings set target.experimental.use-DIL false
+ ```
### Changes to lldb-dap
>From c3d1940ddb086bda4dffe03737754a57f62a5507 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice at google.com>
Date: Fri, 11 Jul 2025 16:35:24 -0700
Subject: [PATCH 2/4] Small fixes: - Remove not-always-valid field-name check
when evaluating field members. - Fix unexpected passes in TestDAP_evaluate
(test owner said it was ok). - Add more anonymous namespace tests.
---
lldb/source/ValueObject/DILEval.cpp | 2 +-
.../QualifiedId/TestFrameVarDILQualifiedId.py | 14 +++++++++++++
.../frame/var-dil/basics/QualifiedId/main.cpp | 21 ++++++++++++++++++-
.../lldb-dap/evaluate/TestDAP_evaluate.py | 6 +++---
4 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/lldb/source/ValueObject/DILEval.cpp b/lldb/source/ValueObject/DILEval.cpp
index fd3f9f8724608..6f28434c646cd 100644
--- a/lldb/source/ValueObject/DILEval.cpp
+++ b/lldb/source/ValueObject/DILEval.cpp
@@ -303,7 +303,7 @@ Interpreter::Visit(const MemberOfNode *node) {
}
}
- if (field_obj && field_obj->GetName() == node->GetFieldName()) {
+ if (field_obj) {
if (m_use_dynamic != lldb::eNoDynamicValues) {
lldb::ValueObjectSP dynamic_val_sp =
field_obj->GetDynamicValue(m_use_dynamic);
diff --git a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/TestFrameVarDILQualifiedId.py b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/TestFrameVarDILQualifiedId.py
index b2ce9602e6a50..8c009aa182d07 100644
--- a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/TestFrameVarDILQualifiedId.py
+++ b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/TestFrameVarDILQualifiedId.py
@@ -29,3 +29,17 @@ def test_frame_var(self):
self.expect_var_path("ns::i", value="1")
self.expect_var_path("::ns::ns::i", value="2")
self.expect_var_path("ns::ns::i", value="2")
+
+ self.expect_var_path("foo", value="1")
+ self.expect_var_path("::(anonymous namespace)::foo", value="13")
+ self.expect_var_path("(anonymous namespace)::foo", value="13")
+ self.expect_var_path("ns1::(anonymous namespace)::foo", value="5")
+ self.expect_var_path(
+ "(anonymous namespace)::ns2::(anonymous namespace)::foo",
+ value="7",
+ )
+ self.expect_var_path("::ns1::(anonymous namespace)::foo", value="5")
+ self.expect_var_path(
+ "::(anonymous namespace)::ns2::(anonymous namespace)::foo",
+ value="7",
+ )
diff --git a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
index 8a5c47a6f364c..8c7e01a6f40af 100644
--- a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
+++ b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
@@ -10,7 +10,26 @@ int i = 2;
} // namespace ns
+namespace {
+ int foo = 13;
+}
+
+namespace ns1 {
+ namespace {
+ int foo = 5;
+ }
+}
+
+namespace {
+ namespace ns2 {
+ namespace {
+ int foo = 7;
+ }
+ }
+}
+
int main(int argc, char **argv) {
+ int foo = 1;
- return 0; // Set a breakpoint here
+ return foo + ::foo + ns1::foo + ns2::foo; // Set a breakpoint here
}
diff --git a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
index 0d2774b281710..20a75f4076e42 100644
--- a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
+++ b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
@@ -131,7 +131,7 @@ def run_test_evaluate_expressions(
self.assertEvaluateFailure("a_function(1)")
self.assertEvaluateFailure("var2 + struct1.foo")
self.assertEvaluateFailure("foo_func")
- self.assertEvaluateFailure("foo_var")
+ self.assertEvaluate("foo_var", "44")
# Expressions at breakpoint 2, which is an anonymous block
self.continue_to_breakpoint(breakpoint_2)
@@ -169,7 +169,7 @@ def run_test_evaluate_expressions(
self.assertEvaluateFailure("a_function(1)")
self.assertEvaluateFailure("var2 + struct1.foo")
self.assertEvaluateFailure("foo_func")
- self.assertEvaluateFailure("foo_var")
+ self.assertEvaluate("foo_var", "44")
# Expressions at breakpoint 3, which is inside a_function
self.continue_to_breakpoint(breakpoint_3)
@@ -195,7 +195,7 @@ def run_test_evaluate_expressions(
self.assertEvaluateFailure("a_function(1)")
self.assertEvaluateFailure("list + 1")
self.assertEvaluateFailure("foo_func")
- self.assertEvaluateFailure("foo_var")
+ self.assertEvaluate("foo_var", "44")
# Now we check that values are updated after stepping
self.continue_to_breakpoint(breakpoint_4)
>From 789a29687efa158eddee5d1ac103ca2e6c79a7ce Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice at google.com>
Date: Fri, 11 Jul 2025 16:47:25 -0700
Subject: [PATCH 3/4] Fix clang-format issues.
---
.../frame/var-dil/basics/QualifiedId/main.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
index 8c7e01a6f40af..10ffa1e54a991 100644
--- a/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
+++ b/lldb/test/API/commands/frame/var-dil/basics/QualifiedId/main.cpp
@@ -11,22 +11,22 @@ int i = 2;
} // namespace ns
namespace {
- int foo = 13;
+int foo = 13;
}
namespace ns1 {
- namespace {
- int foo = 5;
- }
+namespace {
+int foo = 5;
}
+} // namespace ns1
namespace {
- namespace ns2 {
- namespace {
- int foo = 7;
- }
- }
+namespace ns2 {
+namespace {
+int foo = 7;
}
+} // namespace ns2
+} // namespace
int main(int argc, char **argv) {
int foo = 1;
>From 44611983abb483c592177cb0d1b98f24cd5b23aa Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice at google.com>
Date: Mon, 14 Jul 2025 08:25:53 -0700
Subject: [PATCH 4/4] Update TestDedupWarnings.test to use 'expr' instead of
'p'.
---
lldb/test/Shell/SymbolFile/DWARF/TestDedupWarnings.test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldb/test/Shell/SymbolFile/DWARF/TestDedupWarnings.test b/lldb/test/Shell/SymbolFile/DWARF/TestDedupWarnings.test
index d4fcf78d01b81..c29b51219d191 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/TestDedupWarnings.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/TestDedupWarnings.test
@@ -15,7 +15,7 @@
# RUN: %clang_host -fmodules -Xclang -fmodules-cache-path=%t/cache -I%t -g -gmodules %t/b.m -o %t/b.o -c
# RUN: %clang_host %t/a.o %t/b.o -o %t/a.out
# RUN: rm -rf %t/cache
-# RUN: %lldb %t/a.out -o "b main" -o run -o "p a" -o "p b" -o q 2>&1 | FileCheck %s
+# RUN: %lldb %t/a.out -o "b main" -o run -o "expr a" -o "expr b" -o q 2>&1 | FileCheck %s
# CHECK: {{[ab]}}.o{{.*}}/cache/{{.*}}/C-{{.*}}.pcm' does not exist
# CHECK-NOT: /cache/{{.*}}/C-{.*}.pcm' does not exist
# CHECK: {{[ab]}}.o{{.*}}/cache/{{.*}}/C-{{.*}}.pcm' does not exist
More information about the llvm-commits
mailing list