Skip to content
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

Fix pdb uplift when executable has dashes. #8123

Merged
merged 1 commit into from
Apr 17, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 17, 2020

Windows .pdb files were not being uplifted for executables with dashes in their name. rustc calls the linker with the crate name (with underscores), which creates a pdb with underscores. Cargo renames the executable (foo_bar.exe to foo-bar.exe), and it was expecting the pdb to have the same form, but it doesn't.

Note: There shouldn't be any effect for using a debugger. Because the pdb path is embedded in the executable, the debugger was already looking in the deps/ folder. Uplifting is only useful if you want to copy the exe/pdb pair to some other machine. In that case, it looks in the same directory as the exe for the pdb file.

Fixes #8117

@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Apr 17, 2020

@alexcrichton, btw, shouldn't allows_underscores really be "allows_dashes"? I'm a bit confused by the wording.

@alexcrichton
Copy link
Member

Heh, yes, not sure how I managed to typo that...

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 17, 2020

📌 Commit 3acd15e has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2020
@bors
Copy link
Contributor

bors commented Apr 17, 2020

⌛ Testing commit 3acd15e with merge 1638705...

@bors
Copy link
Contributor

bors commented Apr 17, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 1638705 to master...

@bors bors merged commit 1638705 into rust-lang:master Apr 17, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 22, 2020
Update cargo, rls

## cargo

17 commits in ebda5065ee8a1e46801380abcbac21a25bc7e755..8751eb3010d4cdb5329b5a6bd2b6d765c95b0dca
2020-04-16 14:28:43 +0000 to 2020-04-21 18:04:35 +0000
- Uplift windows gnu DLL import libraries. (rust-lang/cargo#8141)
- Add windows-gnu CI and fix tests (rust-lang/cargo#8139)
- Several updates to token/index handling. (rust-lang/cargo#7973)
- Add `resolver` opt-in for new feature resolver. (rust-lang/cargo#8129)
- Improve error message when running `cargo install .` (rust-lang/cargo#8137)
- fix mem replace unused (rust-lang/cargo#8138)
- Change `-Cembed-bitcode=no` use to `-Cbitcode-in-rlib=no`. (rust-lang/cargo#8134)
- Refactor BuildContext (rust-lang/cargo#8068)
- Rename allows_underscores to allows_dashes. (rust-lang/cargo#8135)
- Fixed a needless borrow. (rust-lang/cargo#8130)
- Add link to changelog in the Cargo book. (rust-lang/cargo#8126)
- Fix target for doc test cross compilation (rust-lang/cargo#8094)
- Add note about .cargo/config support. (rust-lang/cargo#8125)
- Fix pdb uplift when executable has dashes. (rust-lang/cargo#8123)
- Hint upgrading for future edition keys (rust-lang/cargo#8122)
- Use some fs shorthand functions. (rust-lang/cargo#8124)
- Update documentation to mention "config.toml" instead of "config" (rust-lang/cargo#8121)

## rls

1 commits in 2659cbf14bfb0929a16d7ce9b6858d0bb286ede7..7de2a1f299f8744ffe109139f9f1fdf28bfec909
2020-04-14 22:07:24 +0200 to 2020-04-19 22:41:55 +0000
- Update cargo (rust-lang/rls#1663)
@yatesco
Copy link

yatesco commented Apr 22, 2020

Hi there - any idea when this will be released to stable? Thanks!

@Eh2406
Copy link
Contributor

Eh2406 commented Apr 22, 2020

Nightly in a week or two, witch will be 1.44 I think. It will be stable in 12 weeks.

@ehuss
Copy link
Contributor Author

ehuss commented Apr 22, 2020

It should be in nightly tonight (2020-04-23). Beta has already branched, so it will be in 1.45 (release july 16).

@ehuss ehuss added this to the 1.45.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

x86_64-pc-windows-msvc target not producing PDB for large project
6 participants