https://github.com/ldionne updated
https://github.com/llvm/llvm-project/pull/141543
>From 75f0f1463c7bcabb5ffef34c0f1e1c0b4ca91b04 Mon Sep 17 00:00:00 2001
From: "A. Jiang" <d...@live.cn>
Date: Tue, 27 May 2025 12:10:36 +0800
Subject: [PATCH 1/3] [libc++][lldb-dap][test] Fix CI for bootstrapping-build
---
libcxx/include/__config | 2 ++
.../lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 57223e4f1db18..49abe17a4da76 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1219,3 +1219,5 @@ typedef __char32_t char32_t;
#endif // __cplusplus
#endif // _LIBCPP___CONFIG
+
+// Just for CI, will be reverted.
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
index 1e41e841e39bc..1751c52072aac 100644
---
a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
+++
b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
@@ -17,7 +17,7 @@ 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)
+ self.build_and_launch(program, disableASLR=False)
source = "main.cpp"
self.set_source_breakpoints(source, [line_number(source, "BREAK
HERE")])
self.continue_to_next_stop()
>From aa5bb01d57c54bde6d1f7dffc57498517bc38c18 Mon Sep 17 00:00:00 2001
From: "A. Jiang" <d...@live.cn>
Date: Wed, 28 May 2025 02:41:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Adopt=20@ashgti=E2=80=98s=20review=20commen?=
=?UTF-8?q?ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Change the default argument for `disableASLR` in `dap_server.py`.
- Revert change in `TestDAP_subtleFrames.py`.
---
.../packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py | 2 +-
.../lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
index a028381a0a4f9..4c8c51905e1d0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
@@ -856,7 +856,7 @@ def request_launch(
cwd: Optional[str] = None,
env: Optional[dict[str, str]] = None,
stopOnEntry=False,
- disableASLR=True,
+ disableASLR=False,
disableSTDIO=False,
shellExpandArguments=False,
runInTerminal=False,
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
index 1751c52072aac..1e41e841e39bc 100644
---
a/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
+++
b/lldb/test/API/tools/lldb-dap/stackTrace/subtleFrames/TestDAP_subtleFrames.py
@@ -17,7 +17,7 @@ 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, disableASLR=False)
+ self.build_and_launch(program)
source = "main.cpp"
self.set_source_breakpoints(source, [line_number(source, "BREAK
HERE")])
self.continue_to_next_stop()
>From 1780da1747a089e41566bf17c9944a447f8b8202 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionn...@gmail.com>
Date: Wed, 28 May 2025 14:29:18 -0400
Subject: [PATCH 3/3] Remove comment
---
libcxx/include/__config | 2 --
1 file changed, 2 deletions(-)
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 49abe17a4da76..57223e4f1db18 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1219,5 +1219,3 @@ typedef __char32_t char32_t;
#endif // __cplusplus
#endif // _LIBCPP___CONFIG
-
-// Just for CI, will be reverted.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
