Always run AD cleanup pass. (#5157)

2 files changed, 6 insertions, 6 deletions

diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp
index 71ef7ee33..a29142ba1 100644
--- a/source/slang/slang-emit.cpp
+++ b/source/slang/slang-emit.cpp
@@ -834,12 +834,10 @@ Result linkAndOptimizeIR(
     if (codeGenContext->shouldReportCheckpointIntermediates())
         reportCheckpointIntermediates(codeGenContext, sink, irModule);
 
-    if (requiredLoweringPassSet.autodiff)
-        finalizeAutoDiffPass(targetProgram, irModule);
-
-    // Remove auto-diff related decorations.
-    // We may have an autodiff decoration regardless of if autodiff is being used.
-    stripAutoDiffDecorations(irModule);
+    // Finalization is always run so AD-related instructions can be removed,
+    // even the AD pass itself is not run.
+    // 
+    finalizeAutoDiffPass(targetProgram, irModule);
 
     finalizeSpecialization(irModule);
 
diff --git a/source/slang/slang-ir-autodiff.cpp b/source/slang/slang-ir-autodiff.cpp
index 94a605a68..6c729ea63 100644
--- a/source/slang/slang-ir-autodiff.cpp
+++ b/source/slang/slang-ir-autodiff.cpp
@@ -2559,6 +2559,8 @@ bool finalizeAutoDiffPass(TargetProgram* target, IRModule* module)
 
     stripNoDiffTypeAttribute(module);
 
+    stripAutoDiffDecorations(module);
+
     return modified;
 }