Merge branch 'topic/165' into 'master'

silent_exception_handlers: Fix handling of case statements. See merge request eng/libadalang/langkit-query-language!141
AdaCore · Nov 20, 2023 · e1cc9f5 · e1cc9f5
2 parents 15bd7c9 + e756bb4
commit e1cc9f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lkql_checker/share/lkql/control_flow.lkql b/lkql_checker/share/lkql/control_flow.lkql
@@ -31,7 +31,7 @@ fun all_branches(stmt) =
         & [alt.f_stmts for alt in stmt.f_alternatives.children].to_list
         & [stmt.f_else_stmts]
     | CaseStmt =>
-        [alt.f_stmts for alt in stmt.f_alternatives]
+        [alt.f_stmts for alt in stmt.f_alternatives.children]
     | BaseLoopStmt =>
         # We cannot know for sure that control will go inside the loop, so
         # return "null" as well.

diff --git a/testsuite/tests/checks/silent_exception_handlers/exc.adb b/testsuite/tests/checks/silent_exception_handlers/exc.adb
@@ -22,9 +22,14 @@ exception
       if I = 0 then
          Log ("0");
       elsif I = 1 then
-         Log ("other");
+         Log ("1");
       else
-         raise;
+         case I is
+            when 2 =>
+               Log ("2");
+            when others =>
+               raise
+         end case;
       end if;
    when E : others =>        --  NOFLAG
       I := 0;