diff options
| author | bors <bors@rust-lang.org> | 2023-09-08 17:20:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-08 17:20:23 +0000 |
| commit | 26f4b7272428b181e0a88ad075e5c8f09dcb0e5c (patch) | |
| tree | 414474d281b3ea7204927e0d2ecce11c9e268e22 /compiler/rustc_codegen_cranelift | |
| parent | 3cd97ed3c3efe11bf6b63d23dce2515238b78a57 (diff) | |
| parent | c83eba92518166b9e40f43b40683d74c919af0ed (diff) | |
| download | rust-26f4b7272428b181e0a88ad075e5c8f09dcb0e5c.tar.gz rust-26f4b7272428b181e0a88ad075e5c8f09dcb0e5c.zip | |
Auto merge of #115418 - Zoxc:freeze-source, r=oli-obk
Use `Freeze` for `SourceFile` This uses the `Freeze` type in `SourceFile` to let accessing `external_src` and `lines` be lock-free. Behavior of `add_external_src` is changed to set `ExternalSourceKind::AbsentErr` on a hash mismatch which matches the documentation. `ExternalSourceKind::Unneeded` was removed as it's unused. Based on https://github.com/rust-lang/rust/pull/115401.
Diffstat (limited to 'compiler/rustc_codegen_cranelift')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs b/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs index 998263de584..b19b935a0fe 100644 --- a/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs +++ b/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs @@ -81,7 +81,7 @@ impl DebugContext { match tcx.sess.source_map().lookup_line(span.lo()) { Ok(SourceFileAndLine { sf: file, line }) => { - let line_pos = file.lines(|lines| lines[line]); + let line_pos = file.lines()[line]; let col = file.relative_position(span.lo()) - line_pos; (file, u64::try_from(line).unwrap() + 1, u64::from(col.to_u32()) + 1) |