diff options
| author | Ralf Jung <post@ralfj.de> | 2023-09-06 08:05:02 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-09-06 08:05:02 +0200 |
| commit | 7a599d758d7fa84ac2e77733bb4c5b0fa0ead847 (patch) | |
| tree | db5ea783b7e7a8264cc9edeadf142e2203083fa5 /compiler/rustc_codegen_llvm | |
| parent | 2416eae1098d2963a2c5b05612324083e54b0dd2 (diff) | |
| parent | fe614712dded0a861fbcbf654663128318eb6dfb (diff) | |
| download | rust-7a599d758d7fa84ac2e77733bb4c5b0fa0ead847.tar.gz rust-7a599d758d7fa84ac2e77733bb4c5b0fa0ead847.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs index d174a3593b9..ebf4ee4164f 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs @@ -68,7 +68,7 @@ fn make_mir_scope<'ll, 'tcx>( let file = cx.sess().source_map().lookup_source_file(mir.span.lo()); debug_context.scopes[scope] = DebugScope { file_start_pos: file.start_pos, - file_end_pos: file.end_pos, + file_end_pos: file.end_position(), ..debug_context.scopes[scope] }; instantiated.insert(scope); @@ -120,7 +120,7 @@ fn make_mir_scope<'ll, 'tcx>( dbg_scope, inlined_at: inlined_at.or(parent_scope.inlined_at), file_start_pos: loc.file.start_pos, - file_end_pos: loc.file.end_pos, + file_end_pos: loc.file.end_position(), }; instantiated.insert(scope); } diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs index 40714a0afe9..2301f66dc28 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs @@ -267,7 +267,7 @@ impl CodegenCx<'_, '_> { // Use 1-based indexing. let line = (line + 1) as u32; - let col = (pos - line_pos).to_u32() + 1; + let col = (file.relative_position(pos) - line_pos).to_u32() + 1; (file, line, col) } |