shader: Fix dependency on identity removal pass

2 files changed, 8 insertions, 3 deletions

diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp
index b0f7e2269..3b3fea50c 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_context.cpp
@@ -114,7 +114,7 @@ EmitContext::~EmitContext() = default;
 
 Id EmitContext::Def(const IR::Value& value) {
     if (!value.IsImmediate()) {
-        return value.Inst()->Definition<Id>();
+        return value.InstRecursive()->Definition<Id>();
     }
     switch (value.Type()) {
     case IR::Type::Void:
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index 6389d80bf..9dc769307 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -250,7 +250,7 @@ Id PhiArgDef(EmitContext& ctx, IR::Inst* inst, size_t index) {
         // Let the context handle immediate definitions, as it already knows how
         return ctx.Def(arg);
     }
-    IR::Inst* const arg_inst{arg.Inst()};
+    IR::Inst* const arg_inst{arg.InstRecursive()};
     if (const Id def{arg_inst->Definition<Id>()}; Sirit::ValidId(def)) {
         // Return the current definition if it exists
         return def;
@@ -296,7 +296,12 @@ Id EmitPhi(EmitContext& ctx, IR::Inst* inst) {
 void EmitVoid(EmitContext&) {}
 
 Id EmitIdentity(EmitContext& ctx, const IR::Value& value) {
-    return ctx.Def(value);
+    if (const Id id = ctx.Def(value); Sirit::ValidId(id)) {
+        return id;
+    }
+    const Id def{ctx.ForwardDeclarationId()};
+    value.InstRecursive()->SetDefinition<Id>(def);
+    return def;
 }
 
 void EmitGetZeroFromOp(EmitContext&) {