1 files changed, 8 insertions, 6 deletions
diff --git a/source/slang/slang-ir-dce.cpp b/source/slang/slang-ir-dce.cpp
index 05c10b317..251b473e0 100644
--- a/source/slang/slang-ir-dce.cpp
+++ b/source/slang/slang-ir-dce.cpp
@@ -237,14 +237,16 @@ struct DeadCodeEliminationContext
             // might still be dead.
             //
             // The biggest wrinkle is that we walk the linked list of
-            // children/decorations a bit carefully, using a temporary
-            // to hold the next node, in case we eliminate one of
-            // the children as we go.
+            // children/decorations a bit carefully, because eliminating one inst
+            // may cause the other nodes to be hoisted out of the current scope.
+            // We need to cache all children in a work list to ensure they are
+            // properly traversed.
             //
-            IRInst* next = nullptr;
-            for( IRInst* child = inst->getFirstDecorationOrChild(); child; child = next )
+            List<IRInst*> children;
+            for (auto child : inst->getDecorationsAndChildren())
+                children.add(child);
+            for(IRInst* child : children)
             {
-                next = child->getNextInst();
                 changed |= eliminateDeadInstsRec(child);
             }
         }