[kernel] Var is in scope if sdef == stmt

src/kernel_services/ast_data/kernel_function.ml

@@ -540,6 +540,8 @@ let var_is_in_scope stmt vi =
   let blocks = find_all_enclosing_blocks stmt in
   let is_def_above b =
     let sdef = local_definition (find_englobing_kf stmt) vi in
+    (* If sdef == stmt, vi is in the scope. *)
+    Cil_datatype.Stmt.equal sdef stmt ||
     match b.bstmts with
     | [] -> assert false (* at least contains stmt *)
     | sfst :: _ ->

src/kernel_services/ast_data/kernel_function.mli

@@ -143,7 +143,7 @@ val local_definition: t -> varinfo -> stmt
 *)
 
 val var_is_in_scope: stmt -> varinfo -> bool
-(** [var_is_in_scope kf stmt vi] returns [true] iff the local variable [vi]
+(** [var_is_in_scope stmt vi] returns [true] iff the local variable [vi]
     is syntactically visible from statement [stmt] in function [kf]. Note
     that on the contrary to {!Globals.Syntactic_search.find_in_scope}, the
     variable is searched according to its [vid], not its [vorig_name].