[SPIR-V] Update submodules (#7029)

cassiebeckley · web-flow · commit d39324e06351 · 2024-12-05T21:45:04.000Z
Update submodules in preparation for release.
diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit 252dc2df08f58e0e50c8437edc0e77eacdfb7559
+Subproject commit 3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
@@ -1 +1 @@
-Subproject commit 298055b25cab863d73a8588ce482d8e77c77b807
+Subproject commit 4d2f0b40bfe290dea6c6904dafdf7fd8328ba346
diff --git a/tools/clang/lib/SPIRV/EmitVisitor.cpp b/tools/clang/lib/SPIRV/EmitVisitor.cpp
@@ -385,6 +385,10 @@ void EmitVisitor::emitDebugLine(spv::Op op, const SourceLocation &loc,
     debugColumnEnd = columnEnd;
   }
 
+  if (columnEnd < columnStart) {
+    columnEnd = columnStart = 0;
+  }
+
   curInst.clear();
   if (!spvOptions.debugInfoVulkan) {
     curInst.push_back(static_cast<uint32_t>(spv::Op::OpLine));
diff --git a/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl b/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl
@@ -60,7 +60,7 @@ void main() {
 // CHECK:      DebugLine [[src]] %uint_46 %uint_46 %uint_12 %uint_12
 // CHECK-NEXT: OpConvertFToS %int
 // CHECK-NEXT: OpConvertFToS %int
-// CHECK:      DebugLine [[src]] %uint_46 %uint_65 %uint_12 %uint_3
+// CHECK:      DebugLine [[src]] %uint_46 %uint_65 %uint_0 %uint_0
 // CHECK:      OpCompositeConstruct %v4int
   };
 
