diff --git a/.pick_status.json b/.pick_status.json
index 88ff01f3d9d..9b0f177f122 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2299,7 +2299,7 @@
         "description": "aco: Fix live_var_analysis assert",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3d4f6a00b8e8710bbc265f8a5e3050d0550e1491"
     },
diff --git a/src/amd/compiler/aco_live_var_analysis.cpp b/src/amd/compiler/aco_live_var_analysis.cpp
index bedc829a901..ef5b20b6101 100644
--- a/src/amd/compiler/aco_live_var_analysis.cpp
+++ b/src/amd/compiler/aco_live_var_analysis.cpp
@@ -292,7 +292,7 @@ process_live_temps_per_block(Program* program, live& lives, Block* block, unsign
       phi_idx--;
    }
 
-   assert(block->index != 0 || (new_demand == RegisterDemand() && live.empty()));
+   assert(!block->linear_preds.empty() || (new_demand == RegisterDemand() && live.empty()));
 }
 
 unsigned