From d0acacc83ce879a5076ce3c10c08e16b77e2e821 Mon Sep 17 00:00:00 2001
From: dan sinclair <[email protected]>
Date: Tue, 01 Sep 2026 12:13:41 -0700
Subject: [PATCH] Fix issue with emit_continue block maintenance.

The `emit_continuing_` callback in the printers is currently maintained
through a TINT_SCOPED_ASSIGNMENT. This will store the old value away and
put a new one in place. This works up until the point when you assign a
function pointer while executing the outer function pointer. The act of
copying away does a move/destroy of the current function, which is being
executed.

If this shows up as an issue depends on how the compiler structures the
functions and other surrounding code. This has only been reproducible on
certain printers under ASAN with a GCC build.

Fixed: 554992296
Change-Id: If96d213ac9605871e5e84ec673fcd1df82c2642f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/338575
Reviewed-by: Kai Ninomiya <[email protected]>
Reviewed-by: James Price <[email protected]>
Commit-Queue: dan sinclair <[email protected]>
---
diff --git a/src/tint/lang/glsl/writer/printer/printer.cc b/src/tint/lang/glsl/writer/printer/printer.cc
index c7ffb7d..5497bf6 100644
--- a/src/tint/lang/glsl/writer/printer/printer.cc
+++ b/src/tint/lang/glsl/writer/printer/printer.cc
@@ -27,8 +27,10 @@
 
 #include "src/tint/lang/glsl/writer/printer/printer.h"
 
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "src/tint/lang/core/constant/splat.h"
 #include "src/tint/lang/core/enums.h"
@@ -228,7 +230,7 @@
         struct_to_padding_struct_ids_;
 
     /// Block to emit for a continuing
-    std::function<void()> emit_continuing_;
+    std::vector<std::unique_ptr<std::function<void()>>> emit_continuing_;
 
     /// @returns `true` if @p ident should be renamed
     bool ShouldRename(std::string_view ident) {
@@ -506,8 +508,9 @@
     void EmitDiscard() { Line() << "discard;"; }
 
     void EmitContinue(const core::ir::Continue* c) {
-        if (emit_continuing_) {
-            emit_continuing_();
+        if (!emit_continuing_.empty()) {
+            auto fn = emit_continuing_.back().get();
+            (*fn)();
         }
         if (c->Block() != c->Loop()->Body()) {
             Line() << "continue;";
@@ -527,18 +530,17 @@
         //   }
         // }
 
-        auto emit_continuing = [&] {
-            Line() << "{";
-            {
-                const ScopedIndent si(current_buffer_);
-                EmitBlock(l->Continuing());
-            }
-            Line() << "}";
-        };
-        TINT_SCOPED_ASSIGNMENT(emit_continuing_, emit_continuing);
-
         Line() << "{";
         {
+            emit_continuing_.push_back(std::make_unique<std::function<void()>>([&] {
+                Line() << "{";
+                {
+                    const ScopedIndent si(current_buffer_);
+                    EmitBlock(l->Continuing());
+                }
+                Line() << "}";
+            }));
+
             ScopedIndent init(current_buffer_);
             EmitBlock(l->Initializer());
 
@@ -548,6 +550,8 @@
                 EmitBlock(l->Body());
             }
             Line() << "}";
+
+            emit_continuing_.pop_back();
         }
         Line() << "}";
     }
diff --git a/src/tint/lang/hlsl/writer/printer/printer.cc b/src/tint/lang/hlsl/writer/printer/printer.cc
index beb8fae..e14f6a7 100644
--- a/src/tint/lang/hlsl/writer/printer/printer.cc
+++ b/src/tint/lang/hlsl/writer/printer/printer.cc
@@ -211,7 +211,7 @@
     const core::ir::Block* current_block_ = nullptr;
 
     /// Block to emit for a continuing
-    std::function<void()> emit_continuing_;
+    std::vector<std::unique_ptr<std::function<void()>>> emit_continuing_;
 
     /// `true` if the linalg.h header has been included.
     bool linalg_included = false;
@@ -494,8 +494,9 @@
     }
 
     void EmitContinue(const core::ir::Continue* c) {
-        if (emit_continuing_) {
-            emit_continuing_();
+        if (!emit_continuing_.empty()) {
+            auto fn = emit_continuing_.back().get();
+            (*fn)();
         }
         if (c->Block() != c->Loop()->Body()) {
             Line() << "continue;";
@@ -558,20 +559,19 @@
                 Line() << "while(true) {";
             }
 
-            auto emit_continuing = [&] {
-                if (uses_for_loop_update) {
-                    return;
-                }
-                Line() << "{";
-                {
-                    const ScopedIndent si(current_buffer_);
-                    EmitBlock(l->Continuing());
-                }
-                Line() << "}";
-            };
-            TINT_SCOPED_ASSIGNMENT(emit_continuing_, emit_continuing);
-
             {
+                emit_continuing_.push_back(std::make_unique<std::function<void()>>([&] {
+                    if (uses_for_loop_update) {
+                        return;
+                    }
+                    Line() << "{";
+                    {
+                        const ScopedIndent si(current_buffer_);
+                        EmitBlock(l->Continuing());
+                    }
+                    Line() << "}";
+                }));
+
                 const ScopedIndent si(current_buffer_);
                 if (has_loop_condition) {
                     EmitBlock(l->Body(), [&analysis](const core::ir::Instruction* inst) {
@@ -580,6 +580,8 @@
                 } else {
                     EmitBlock(l->Body());
                 }
+
+                emit_continuing_.pop_back();
             }
             Line() << "}";
         }
diff --git a/src/tint/lang/msl/writer/printer/printer.cc b/src/tint/lang/msl/writer/printer/printer.cc
index abc29ee..5452d56 100644
--- a/src/tint/lang/msl/writer/printer/printer.cc
+++ b/src/tint/lang/msl/writer/printer/printer.cc
@@ -30,8 +30,10 @@
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "src/tint/lang/core/constant/splat.h"
 #include "src/tint/lang/core/constant/string.h"
@@ -202,7 +204,7 @@
     std::string array_template_name_;
 
     /// Block to emit for a continuing
-    std::function<void()> emit_continuing_;
+    std::vector<std::unique_ptr<std::function<void()>>> emit_continuing_;
 
     /// @returns the name of the templated `tint_array` helper type, generating it if needed
     const std::string& ArrayTemplateName() {
@@ -730,8 +732,9 @@
     }
 
     void EmitContinue(const core::ir::Continue* c) {
-        if (emit_continuing_) {
-            emit_continuing_();
+        if (!emit_continuing_.empty()) {
+            auto fn = emit_continuing_.back().get();
+            (*fn)();
         }
         if (c->Block() != c->Loop()->Body()) {
             Line() << "continue;";
@@ -749,18 +752,17 @@
         //   }
         // }
 
-        auto emit_continuing = [&] {
-            Line() << "{";
-            {
-                const ScopedIndent si(current_buffer_);
-                EmitBlock(l->Continuing());
-            }
-            Line() << "}";
-        };
-        TINT_SCOPED_ASSIGNMENT(emit_continuing_, emit_continuing);
-
         Line() << "{";
         {
+            emit_continuing_.push_back(std::make_unique<std::function<void()>>([&] {
+                Line() << "{";
+                {
+                    const ScopedIndent si(current_buffer_);
+                    EmitBlock(l->Continuing());
+                }
+                Line() << "}";
+            }));
+
             ScopedIndent init(current_buffer_);
             EmitBlock(l->Initializer());
 
@@ -770,6 +772,8 @@
                 EmitBlock(l->Body());
             }
             Line() << "}";
+
+            emit_continuing_.pop_back();
         }
         Line() << "}";
     }