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.

Sign up for GitHub

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

Jump to bottom

Emit 1-based column numbers in debuginfo #69357

Merged
merged 3 commits into from
Mar 15, 2020
Merged

Emit 1-based column numbers in debuginfo #69357

merged 3 commits into from
Mar 15, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Feb 21, 2020 •
edited
Loading

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @matthewjasper (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 21, 2020
@ecstatic-morse
Copy link
Contributor

cc #65437 #65676

@tmiasko
Copy link
Contributor Author

tmiasko commented Feb 24, 2020

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned matthewjasper Feb 24, 2020
@eddyb
Copy link
Member

eddyb commented Feb 24, 2020

cc @michaelwoerister I can't easily follow most of the original discussion.

@tmiasko
Emit 1-based column numbers in debuginfo
e1a5472 
The debuginfo column numbers are 1-based. The value 0 indicates that no
column has been specified. Translate 0-based column numbers to 1-based
when emitting debug information.
@tmiasko
Use byte offsets when emitting debuginfo columns
0c51f2f
@tmiasko
Test that column information is not emitted for MSVC targets
8e93a01
@tmiasko tmiasko force-pushed the debuginfo-column branch 2 times, most recently from 531e133 to 8e93a01 Compare February 26, 2020 22:32
@tmiasko
Copy link
Contributor Author

tmiasko commented Feb 26, 2020

Updated to use byte position offsets instead of char positions offsets and address #67360.

@tmiasko
Copy link
Contributor Author

tmiasko commented Mar 10, 2020

r? @michaelwoerister

@michaelwoerister
Copy link
Member

Thanks, @tmiasko! Looks good to me.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 11, 2020

📌 Commit 8e93a01 has been approved by michaelwoerister

@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 Mar 11, 2020
bjorn3
bjorn3 reviewed Mar 13, 2020
View reviewed changes
src/librustc_codegen_llvm/debuginfo/source_loc.rs
pub fn create_debug_loc(&self, scope: &'ll DIScope, span: Span) -> &'ll Value {
let loc = span_start(self, span);
/// Looks up debug source information about a `BytePos`.
pub fn lookup_debug_loc(&self, pos: BytePos) -> DebugLoc {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please move this and DebugLoc to rustc_codegen_ssa?

@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 15, 2020
Merged
bors added a commit that referenced this pull request Mar 15, 2020
@bors
Auto merge of #70016 - Dylan-DPC:rollup-5k7lxs3, r=Dylan-DPC
d7ba638 
Rollup of 7 pull requests

Successful merges:

 - #69357 (Emit 1-based column numbers in debuginfo)
 - #69471 (Remove `sip::Hasher::short_write`.)
 - #69498 (Change "method" to "associated function")
 - #69967 (Remove a few `Rc`s from RegionInferenceCtxt)
 - #69987 (Add self to .mailmap)
 - #69991 (fix E0117 message out of sync)
 - #69993 (Add long error explanation for E0693)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Mar 15, 2020
@bors
Auto merge of #70016 - Dylan-DPC:rollup-5k7lxs3, r=Dylan-DPC
5a72ecf 
Rollup of 7 pull requests

Successful merges:

 - #69357 (Emit 1-based column numbers in debuginfo)
 - #69471 (Remove `sip::Hasher::short_write`.)
 - #69498 (Change "method" to "associated function")
 - #69967 (Remove a few `Rc`s from RegionInferenceCtxt)
 - #69987 (Add self to .mailmap)
 - #69991 (fix E0117 message out of sync)
 - #69993 (Add long error explanation for E0693)

Failed merges:

r? @ghost
@bors bors merged commit 62c0579 into rust-lang:master Mar 15, 2020
@tmiasko tmiasko deleted the debuginfo-column branch March 15, 2020 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@michaelwoerister michaelwoerister

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[debuginfo] Use byte pos instead of char pos for lineinfo column index Off-by-one in generated DWARF columns
8 participants
@tmiasko @rust-highfive @ecstatic-morse @eddyb @michaelwoerister @bors @bjorn3 @matthewjasper