diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index e4bf0bc6..4a622185 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1518,12 +1518,14 @@ static void copy_propagation_set_value(struct hlsl_ctx *ctx, struct copy_propaga
 }
 
 static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx,
-        const struct copy_propagation_state *state, const struct hlsl_deref *deref,
+        const struct copy_propagation_state *state, const struct hlsl_ir_load *load,
         unsigned int swizzle, struct hlsl_ir_node *instr)
 {
     const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type);
+    const struct hlsl_deref *deref = &load->src;
     const struct hlsl_ir_var *var = deref->var;
     struct hlsl_ir_node *new_instr = NULL;
+    unsigned int time = load->node.index;
     unsigned int start, count, i;
     unsigned int ret_swizzle = 0;
 
@@ -1535,7 +1537,7 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx,
         struct copy_propagation_value *value;
 
         if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i),
-                instr->index)))
+                time)))
             return false;
 
         if (!new_instr)
@@ -1570,12 +1572,14 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx,
 }
 
 static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx,
-        const struct copy_propagation_state *state, const struct hlsl_deref *deref,
+        const struct copy_propagation_state *state, const struct hlsl_ir_load *load,
         unsigned int swizzle, struct hlsl_ir_node *instr)
 {
     const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type);
+    const struct hlsl_deref *deref = &load->src;
     const struct hlsl_ir_var *var = deref->var;
     struct hlsl_constant_value values = {0};
+    unsigned int time = load->node.index;
     unsigned int start, count, i;
     struct hlsl_ir_node *cons;
 
@@ -1587,7 +1591,7 @@ static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx,
         struct copy_propagation_value *value;
 
         if (!(value = copy_propagation_get_value(state, var, start + hlsl_swizzle_get_component(swizzle, i),
-                instr->index)) || value->node->type != HLSL_IR_CONSTANT)
+                time)) || value->node->type != HLSL_IR_CONSTANT)
             return false;
 
         values.u[i] = hlsl_ir_constant(value->node)->value.u[value->component];
@@ -1624,10 +1628,10 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
             return false;
     }
 
-    if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node))
+    if (copy_propagation_replace_with_constant_vector(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node))
         return true;
 
-    if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, HLSL_SWIZZLE(X, Y, Z, W), &load->node))
+    if (copy_propagation_replace_with_single_instr(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node))
         return true;
 
     return false;
@@ -1642,10 +1646,10 @@ static bool copy_propagation_transform_swizzle(struct hlsl_ctx *ctx,
         return false;
     load = hlsl_ir_load(swizzle->val.node);
 
-    if (copy_propagation_replace_with_constant_vector(ctx, state, &load->src, swizzle->swizzle, &swizzle->node))
+    if (copy_propagation_replace_with_constant_vector(ctx, state, load, swizzle->swizzle, &swizzle->node))
         return true;
 
-    if (copy_propagation_replace_with_single_instr(ctx, state, &load->src, swizzle->swizzle, &swizzle->node))
+    if (copy_propagation_replace_with_single_instr(ctx, state, load, swizzle->swizzle, &swizzle->node))
         return true;
 
     return false;
diff --git a/tests/hlsl/hard-copy-prop.shader_test b/tests/hlsl/hard-copy-prop.shader_test
index 52746b4f..8d20425f 100644
--- a/tests/hlsl/hard-copy-prop.shader_test
+++ b/tests/hlsl/hard-copy-prop.shader_test
@@ -18,7 +18,58 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.0
 draw quad
-todo(sm<6) probe all rgba (2.0, 2.0, 2.0, 2.0)
+probe all rgba (2.0, 2.0, 2.0, 2.0)
 uniform 0 float 1.0
 draw quad
-todo(sm<6) probe all rgba (-2.0, -2.0, -2.0, -2.0)
+probe all rgba (-2.0, -2.0, -2.0, -2.0)
+
+
+[pixel shader]
+float cond;
+
+float4 main() : sv_target
+{
+    float2 r = {1, 2};
+    float2 tmp;
+
+    // invalidate r
+    if (cond)
+        r = float2(10, 20);
+
+    tmp = r;
+    r = tmp;
+    return r.y;
+}
+
+[test]
+uniform 0 float 0.0
+draw quad
+probe all rgba (2.0, 2.0, 2.0, 2.0)
+uniform 0 float 1.0
+draw quad
+probe all rgba (20.0, 20.0, 20.0, 20.0)
+
+
+[pixel shader]
+float cond;
+
+float4 main() : sv_target
+{
+    float2 r = {3, 4};
+
+    // invalidate r
+    if (cond)
+        r = float2(30, 40);
+
+    r = r;
+    r = float2(1, r.y);
+
+    return float4(r, 0, 0);
+}
+[test]
+uniform 0 float 0.0
+draw quad
+probe all rgba (1.0, 4.0, 0.0, 0.0)
+uniform 0 float 1.0
+draw quad
+probe all rgba (1.0, 40.0, 0.0, 0.0)