post merge fixes

Author: baggins183

src/shader_recompiler/ir/microinstruction.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
-#include <any>
 #include <memory>
 
 #include "shader_recompiler/exception.h"
@@ -149,8 +148,8 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
 }
 
 void Inst::Invalidate() {
-    ASSERT(users.list.empty());
     ClearArgs();
+    ASSERT(users.list.empty());
     ReplaceOpcode(Opcode::Void);
 }
 

src/shader_recompiler/recompiler.cpp

@@ -83,9 +83,8 @@ IR::Program TranslateProgram(std::span<const u32> code, Pools& pools, Info& info
     };
 
     Shader::Optimization::SsaRewritePass(program.post_order_blocks);
-    if (extra_id_removal) {
-        Shader::Optimization::IdentityRemovalPass(program.blocks);
-    }
+    Shader::Optimization::IdentityRemovalPass(program.blocks);
+    dumpMatchingIR("post_ssa");
     if (stage == Stage::Hull) {
         dumpMatchingIR("pre_hull");
         Shader::Optimization::HullShaderTransform(program, runtime_info);