commit 19dc86c48c7bf10181cfbbdad2c73bc55da13864
author Greg Fischer <greg@lunarg.com> Fri Sep 24 08:56:08 2021 -0600
committer GitHub <noreply@github.com> Fri Sep 24 10:56:08 2021 -0400
tree e4f302940005371911d12c77ef0497f02dec41aa
parent f125452cf8fc3d359a388402812cda76ca167c98

Handle NonSemantic.Shader Debug[No]Line (#4530)

Debug[No]Line are tracked and optimized using the same mechanism that tracks
and optimizes Op[No]Line.

Also:
    - Fix missing DebugScope at top of block.
    - Allow scalar replacement of access chain in DebugDeclare

source/opt/inline_pass.cpp

diff --git a/source/opt/inline_pass.cpp b/source/opt/inline_pass.cpp
index 8b91ad6..2cc3125 100644
--- a/source/opt/inline_pass.cpp
+++ b/source/opt/inline_pass.cpp
@@ -92,7 +92,7 @@
                       {{spv_operand_type_t::SPV_OPERAND_TYPE_ID, {ptr_id}},
                        {spv_operand_type_t::SPV_OPERAND_TYPE_ID, {val_id}}}));
   if (line_inst != nullptr) {
-    newStore->dbg_line_insts().push_back(*line_inst);
+    newStore->AddDebugLine(line_inst);
   }
   newStore->SetDebugScope(dbg_scope);
   (*block_ptr)->AddInstruction(std::move(newStore));
@@ -106,7 +106,7 @@
       new Instruction(context(), SpvOpLoad, type_id, resultId,
                       {{spv_operand_type_t::SPV_OPERAND_TYPE_ID, {ptr_id}}}));
   if (line_inst != nullptr) {
-    newLoad->dbg_line_insts().push_back(*line_inst);
+    newLoad->AddDebugLine(line_inst);
   }
   newLoad->SetDebugScope(dbg_scope);
   (*block_ptr)->AddInstruction(std::move(newLoad));