From e6b5cc2b345cbaed329a19b6fc4a86ced777fffa Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 6 Apr 2023 14:13:55 +0300
Subject: [PATCH] unwind: ignore path states in pre-merge hook

Path states are special.  Preserve the &ignore state.

Signed-off-by: Dan Carpenter <error27@gmail.com>
---
 check_unwind.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/check_unwind.c b/check_unwind.c
index 3abcf4c4..4c3adf37 100644
--- a/check_unwind.c
+++ b/check_unwind.c
@@ -128,6 +128,8 @@ static struct smatch_state *unmatched_state(struct sm_state *sm)
 
 static void pre_merge_hook(struct sm_state *cur, struct sm_state *other)
 {
+	if (cur->state == &ignore)
+		return;
 	if (cur->state == &param_released)
 		return;
 	if (is_impossible_path())
-- 
2.11.4.GIT