Do not instrument static values as calls

Author: Viviane Garèse

testsuite/tests/287-function_call_cov/contracts/src/test_contracts_not_called.adb

@@ -11,6 +11,6 @@ end Test_Contracts_Not_Called;
 -- /pre/    l- ## a-
 --# contracts.adb
 -- /foo/    l- ## f-
--- /t/      l- ## s-,f-,c-
+-- /t/      l- ## s-,f-
 -- /assert/ l- ## s-,c-,c-
 -- /null/   l- ## s-

testsuite/tests/287-function_call_cov/dotted_type/src/make_call.adb

@@ -45,7 +45,7 @@ begin
        /= 0                                             -- # deci
        and then                                         -- # deci
        Pkg5.F.B)                                        -- # p_pkg5
-       and then False                                   -- # p_call
+       and then False                                   -- # false
    then
       null;                                             -- # null
    end if;

testsuite/tests/287-function_call_cov/dotted_type/src/test_dotted_type.adb

@@ -21,8 +21,8 @@ end Test_Dotted_Type;
 -- /d_nf1/    l! ## 0
 -- /deci/     l! ## 0
 -- /v_dec/    l- ## 0
--- /p_call/   l! ## c-
 -- /p_pkg5/   l! ## c?
+-- /false/    l+ ## 0
 -- /null/     l- ## s-
 --# pkg4.ads
 -- /decl/     l+ ## 0

testsuite/tests/287-function_call_cov/nested_calls/src/nested.adb

@@ -26,7 +26,7 @@ begin
         B                                                             -- # v_call
           (B                                                          -- # v_call
               (B),                                                    -- # v_call
-          False);                                                     -- # v_call
+          False);                                                     -- # v_false
    end if;
 
 end Nested;

testsuite/tests/287-function_call_cov/nested_calls/src/test_nested.adb

@@ -10,9 +10,10 @@ begin
 end Test_Nested;
 
 --# nested.adb
--- /stmt/   l+ ## 0
--- /fun/    l+ ## 0
--- /call/   l+ ## 0
--- /if/     l! ## dT-
--- /v_stmt/ l- ## s-
--- /v_call/ l- ## s=>s-, f=>c-
+-- /stmt/    l+ ## 0
+-- /fun/     l+ ## 0
+-- /call/    l+ ## 0
+-- /if/      l! ## dT-
+-- /v_stmt/  l- ## s-
+-- /v_call/  l- ## f=>c-
+-- /v_false/ l- ## 0

testsuite/tests/287-function_call_cov/protected_body/src/test_not_called.adb

@@ -15,6 +15,6 @@ end Test_Not_Called;
 -- /decl/      l+ ## 0
 --# foo.adb
 -- /fun/       l- ## f-
--- /expr_fun/  l- ## s=>s-, f=>s-,f-,c-
+-- /expr_fun/  l- ## s=>s-, f=>s-,f-
 -- /call_stmt/ f=>l- ## s=>s-, f=>s-,c-
 -- /stmt/      l- ## s-

testsuite/tests/287-function_call_cov/static_call/src/discriminant.adb

@@ -0,0 +1,14 @@
+pragma Ada_2012;
+
+procedure Discriminant is
+   type Color is (Red, Green, Blue, Not_On);          -- # a
+
+   type Disc_Rec (Disc : Color) is                    -- # a
+      record
+         null;                                        -- # a
+   end record;
+
+   My_Rec : constant Disc_Rec := (Disc => Red);       -- # a
+begin
+   null;
+end Discriminant;

testsuite/tests/287-function_call_cov/static_call/src/enum.adb

@@ -0,0 +1,31 @@
+pragma Ada_2012;
+
+procedure Enum is
+   type Color is (Red, Green, Blue, Not_On);       -- # decl
+
+   Pixel_1 : Color := Red;                         -- # decl
+   Pixel_2 : Color := Green;                       -- # decl
+   Pixel_3 : Color := Blue;                        -- # decl
+
+   Nb_Red : Integer := 0;                          -- # decl
+begin
+
+   --  In an if statement
+   if Pixel_1 not in Red then                      -- # if
+     Nb_Red := Nb_Red + 1;                         -- # stmt_no
+   end if;
+
+   --  In a case expression
+   Nb_Red := Nb_Red +                              -- # stmt_yes
+      (case Pixel_2 is                             -- # stmt_yes
+          when Red            => 1,                -- # stmt_yes
+          when Green .. Green => 0,                -- # stmt_yes
+          when Blue | Not_On  => 0);               -- # stmt_yes
+
+   --  In a case statement
+   case Pixel_3 is                                 -- # stmt_yes
+      when Red            => Nb_Red := Nb_Red + 1; -- # stmt_no
+      when Green .. Green => null;                 -- # stmt_no
+      when Blue | Not_On  => null;                 -- # stmt_yes
+   end case;
+end Enum;

testsuite/tests/287-function_call_cov/static_call/src/test_discriminant.adb

@@ -0,0 +1,14 @@
+with Discriminant;
+
+--  Test that the use of enum values, which are calls, are not instrumented as
+--  calls. This is checked with an enum value used in a record discriminant
+--  that needs it to be a static value. Instrumenting it as a call would
+--  result in a compilation error as they would no longer be static.
+
+procedure Test_Discriminant is
+begin
+   Discriminant;
+end Test_Discriminant;
+
+--# discriminant.adb
+-- /a/ l+ ## 0

testsuite/tests/287-function_call_cov/static_call/src/test_enum.adb

@@ -0,0 +1,17 @@
+with Enum;
+
+--  Test that the use of enum values, which are calls, are not instrumented as
+--  calls. This is checked with enum values used in case statements that need
+--  them to be static values. Instrumenting them as calls would result in a
+--  compilation error as they would no longer be static.
+
+procedure Test_Enum is
+begin
+    Enum;
+end Test_Enum;
+
+--# enum.adb
+-- /decl/     l+ ## 0
+-- /if/       l! ## dT-
+-- /stmt_no/  l- ## s-
+-- /stmt_yes/ l+ ## 0

testsuite/tests/287-function_call_cov/static_call/test.py

@@ -0,0 +1,7 @@
+from SCOV.tc import TestCase
+from SCOV.tctl import CAT
+from SUITE.context import thistest
+
+
+TestCase(category=CAT.mcdc, fun_call_lvl=True).run()
+thistest.result()

testsuite/tests/287-function_call_cov/subp_kinds/src/no_decls_called.adb

@@ -101,7 +101,7 @@ begin
        --  statement violations.
        Proc;                                                    -- # v_stmt
        Proc_Param (Dummy);                                      -- # v_stmt
-       Proc_Param (Dummy, False);                               -- # v_cstmt
+       Proc_Param (Dummy, False);                               -- # v_stmt
        Over (5);                                                -- # v_stmt
        Over (1, 2);                                             -- # v_stmt
     end if;

testsuite/tests/287-function_call_cov/subp_kinds/src/test_no_decls_called.adb

@@ -17,6 +17,5 @@ end Test_No_Decls_Called;
 -- /if_cond/    l! ## dT-
 -- /v_dummy/    l- ## s-
 -- /v_stmt/     l- ## s-,c-
--- /v_cstmt/    l- ## s-,c-,c-
 -- /v_call/     l- ## c-
 -- /v_scall/    l- ## s=>s-, f=>s-,c-

testsuite/tests/287-function_call_cov/subp_kinds_with_decls/src/call_with_decls.adb

@@ -53,7 +53,7 @@ begin
        --  statement violations.
        Proc;                                                          -- # v_cstmt
        Proc_Param (Dummy);                                            -- # v_cstmt
-       Proc_Param (Dummy, False);                                     -- # v_false
+       Proc_Param (Dummy, False);                                     -- # v_cstmt
        Over (5);                                                      -- # v_cstmt
        Over (1, 2);                                                   -- # v_cstmt
     end if;

testsuite/tests/287-function_call_cov/subp_kinds_with_decls/src/test_with_decls_called.adb

@@ -16,7 +16,6 @@ end Test_With_Decls_Called;
 -- /v_fun/      l- ## c-
 -- /v_sfun/     l- ## s-,c-
 -- /v_cstmt/    l- ## s-,c-
--- /v_false/    l- ## s-,c-,c-
 --# with_decls.ads
 -- /stmt/       l+ ## 0
 --# with_decls.adb

tools/gnatcov/instrument-ada_unit.adb

@@ -6145,7 +6145,9 @@ package body Instrument.Ada_Unit is
          is
             Full_Call_Node : Ada_Node;
          begin
-            if Is_Call_Leaf (Node) then
+            if Is_Call_Leaf (Node)
+              and then not Is_Static_Expr (Node.As_Expr)
+            then
                Full_Call_Node := Full_Call (Node);
 
                --  Skip calls that are direct children of call statements