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

Add line numbers to MSVC backtrace #28242

Merged
merged 1 commit into from
Sep 5, 2015
Merged

Conversation

Diggsey
Copy link
Contributor

@Diggsey Diggsey commented Sep 4, 2015

Currently LLVM does not generate the debug info required to get complete backtraces even when functions are inlined, so that part of the run-pass/backtrace-debuginfo.rs test is disabled when targetting MSVC. At worst this results in missing stack frames where functions have been inlined.

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@@ -15,7 +15,8 @@ pub fn callback<F>(f: F) where F: FnOnce((&'static str, u32)) {
f((file!(), line!()))
}

#[inline(always)]
#[cfg_attr(not(target_env = "msvc"), inline(always))]
#[cfg_attr(target_env = "msvc", inline(never))]
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a comment explaining what's going on here?

@alexcrichton
Copy link
Member

Awesome, thanks @Diggsey! I had implemented this in backtrace-rs but apparently forgot to port it over!

@alexcrichton alexcrichton assigned alexcrichton and unassigned aturon Sep 4, 2015
@Diggsey
Copy link
Contributor Author

Diggsey commented Sep 4, 2015

All done!

@alexcrichton
Copy link
Member

@bors: r+ 9a83842

@bors
Copy link
Contributor

bors commented Sep 5, 2015

⌛ Testing commit 9a83842 with merge 6b36e92...

bors added a commit that referenced this pull request Sep 5, 2015
Currently LLVM does not generate the debug info required to get complete backtraces even when functions are inlined, so that part of the `run-pass/backtrace-debuginfo.rs` test is disabled when targetting MSVC. At worst this results in missing stack frames where functions have been inlined.
@bors bors merged commit 9a83842 into rust-lang:master Sep 5, 2015
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.

5 participants