spirv_asm: use line_spans for slightly better source locations.

Author: eddyb

crates/rustc_codegen_spirv/src/builder/spirv_asm.rs

@@ -95,7 +95,7 @@ impl<'a, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'tcx> {
         template: &[InlineAsmTemplatePiece],
         operands: &[InlineAsmOperandRef<'tcx, Self>],
         options: InlineAsmOptions,
-        _line_spans: &[Span],
+        line_spans: &[Span],
         _instance: Instance<'_>,
         _dest: Option<Self::BasicBlock>,
         _catch_funclet: Option<(Self::BasicBlock, Option<&Self::Funclet>)>,
@@ -211,7 +211,17 @@ impl<'a, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'tcx> {
         }
 
         let mut asm_block = AsmBlock::Open;
-        for line in tokens {
+        for (line_idx, line) in tokens.into_iter().enumerate() {
+            match asm_block {
+                AsmBlock::Open => {
+                    self.set_span(line_spans.get(line_idx).copied().unwrap_or_default());
+                }
+                // FIXME(eddyb) this line is most likely an `OpLabel`, following
+                // a terminator, and calling `set_span` here will attempt to add
+                // debuginfo in the previous block (i.e. after the terminator),
+                // which is an unfortunate interaction, but perhaps avoidable?
+                AsmBlock::End(_) => {}
+            }
             self.codegen_asm(
                 &mut id_map,
                 &mut defined_ids,

tests/compiletests/ui/arch/all_memory_barrier.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 78 8
+OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/all_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 42 8
+OpLine %5 47 13
 OpControlBarrier %6 %7 %8
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/device_memory_barrier.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 78 8
+OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/device_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 42 8
+OpLine %5 47 13
 OpControlBarrier %6 %7 %8
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/subgroup/subgroup_ballot.stderr

@@ -1,9 +1,9 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 373 8
+OpLine %6 378 13
 %7 = OpGroupNonUniformBallot  %8  %9 %4
-OpLine %6 412 8
+OpLine %6 417 13
 %10 = OpGroupNonUniformInverseBallot  %2  %9 %7
 OpNoLine
 OpReturnValue %10

tests/compiletests/ui/arch/subgroup/subgroup_broadcast_first.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 340 8
+OpLine %6 344 13
 %7 = OpGroupNonUniformBroadcastFirst  %2  %8 %4
 OpNoLine
 OpReturnValue %7

tests/compiletests/ui/arch/subgroup/subgroup_elect.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 170 8
+OpLine %5 174 13
 %6 = OpGroupNonUniformElect  %2  %7
 OpNoLine
 OpReturnValue %6

tests/compiletests/ui/arch/workgroup_memory_barrier.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 78 8
+OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/workgroup_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 42 8
+OpLine %5 47 13
 OpControlBarrier %6 %6 %7
 OpNoLine
 OpReturn