Skip to content

Cherry pick source map fixes #9770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

adrian-prantl
Copy link

No description provided.

@adrian-prantl adrian-prantl requested a review from a team as a code owner December 19, 2024 01:20
@adrian-prantl
Copy link
Author

@swift-ci test

DavidSpickett and others added 24 commits December 19, 2024 17:02
Add Windows include equivalents for includes and shell command.

(cherry picked from commit b2a820f)
Fixes llvm#95137

(cherry picked from commit d4c1789)

 Conflicts:
	lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
…#105278)

Added support for "supportsInstructionBreakpoints" capability and now it
this command is triggered when we set instruction breakpoint.
We need this support as part of enabling disassembly view debugging.
Following features should work as part of this feature enablement:

1. Settings breakpoints in disassembly view: Unsetting the breakpoint is
not happening from the disassembly view. Currently we need to unset
breakpoint manually from the breakpoint List. Multiple breakpoints are
getting set for the same $

2. Step over, step into, continue in the disassembly view

The format for DisassembleRequest and DisassembleResponse at
https://raw.githubusercontent.com/microsoft/vscode/master/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
.

Ref Images:
Set instruction breakpoint in disassembly view:

![image](https://github.com/user-attachments/assets/833bfb34-86f4-40e2-8c20-14b638a612a2)

After issuing continue:

![image](https://github.com/user-attachments/assets/884572a3-915e-422b-b8dd-d132e5c00de6)

---------

Co-authored-by: Santhosh Kumar Ellendula <[email protected]>
Co-authored-by: Santhosh Kumar Ellendula <[email protected]>
(cherry picked from commit 89c27d6)
…re on windows. (llvm#106200)

TestDAP_instruction_breakpoint.py failed on windows, so these tests were
skipped for windows build.

---------

Co-authored-by: Santhosh Kumar Ellendula <[email protected]>
Co-authored-by: Santhosh Kumar Ellendula <[email protected]>
(cherry picked from commit fbef4c2)
At least for our Windows on Arm machine compiling with clang-cl,
it has inverted which variables get a `::` prefix.

Would not surprise me if msvc does the opposite so feel free to
revert if these tests fail for you.

(cherry picked from commit a3cd8d7)
By adding the equivalent includes.

(cherry picked from commit af3ee62)
These tests "just work" on our Windows On Arm machine.

(cherry picked from commit c954306)
This one snuck into the previous patch. The test program needs
updating if it's ever going to work on Windows.

(cherry picked from commit ae34257)
These few worked without changes.

(cherry picked from commit f7d6dfa)
There is a typo in an assertion that causes the instruction break-point
test to be unresolved

(cherry picked from commit 7d7d2d2)
Without this, the binary would still be built with libstdc++, if that's
the system/compiler default.

(cherry picked from commit 069b841)
The test failed in
<https://lab.llvm.org/buildbot/#/builders/162/builds/5785> due to frame
variable not being in stop commands, even though the DAP log shows the
command being present there. I'm pretty sure this is a race in the test
the collection of the test log. I fix that by making sure we wait for
the expected output, and also by increasing the timeout (1s is cutting
it very close).

The arm failure link is no longer functional, but I'm fairly certain
that this was the cause of those flakes as well.

(cherry picked from commit e054712)
This isn't strictly a Windows issue but for now it's the only bot
that was hit by this failure.

It can happen on Linux too but I expect we'll fix it and remove the
skip soon anyway.

Test was added in llvm#104317.

(cherry picked from commit ab38ec9)
So far, the test case was also testing the offset -1. This test cases
failed if the string is immediately at the beginning of the memory
region, though, and the offset -1 hence belonged to a different memory
region.

The fix is rather straightforward:
Passing an offset of -1 is not used by any actual clients of lldb-dap,
anyway. As such, this commit simply removes the corresponding test case.

(cherry picked from commit 620738e)
This test is failing on green dragon and I couldn't figure out why,
disabling it for now under ASAN to get the bot green.

Opened an issue (llvm#111061) to
track the problem.

(cherry picked from commit 47ff13b)
Guessing that this is missing because it's failing on Arm 32 bit
and every other test has this requirement.

(cherry picked from commit 98c9c1a)

 Conflicts:
	lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
…lvm#111543)

I don't see an obvious reason it has to be x86 specific and local
testing on Arm and AArch64 is fine.

Originally disabled in 50337fb in
response to failures apparently caused by
https://reviews.llvm.org/D93951.

Perhaps those still exist but worth trying this and checking I think.

(cherry picked from commit de4f2c9)
…tures" (llvm#111648)

Reverts llvm#111543

https://lab.llvm.org/buildbot/#/builders/18/builds/5140 failed here
again. Clearly there is something different on Arm but I don't know what
it is yet.

(cherry picked from commit b43e003)
…db-dap. (llvm#112384)

Custom DAP events can be detected using
https://code.visualstudio.com/api/references/vscode-api#debug.onDidReceiveDebugSessionCustomEvent.

This API allows an lldb python script to send events to the DAP
client to allow extensions to handle these custom events.

(cherry picked from commit c5c11f3)
New unittest versions don't have the "s" version.

(cherry picked from commit 6e4cd46)
…lvm#116045)

Previously this used `var` as both an lldb command and variable in the
source to validate the behavior of the 'auto' repl mode. However, `var`
seems to occasionally fail in the CI test when attempting to print some
c++ types. Instead switch the command and variable name to `list` which
should not run the dynamic variable formatting code for c++ objects.

This should fix llvm#116041.

(cherry picked from commit c658d07)
@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl
Copy link
Author

@swift-ci test macOS

@adrian-prantl adrian-prantl merged commit 38c9bd4 into swiftlang:swift/release/6.1 Dec 20, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants