Merge branch 'mr/pmderodat/master' into 'master'

Port edge patches to master

See merge request eng/das/cov/gnatcoverage!980

For https://gitlab.adacore-it.com/eng/shared/anod/-/issues/717

Depends-On: https://gitlab.adacore-it.com/eng/shared/anod/-/merge_requests/6950

Author: pmderodat

doc/gnatcov/external_annotations.rst

@@ -378,8 +378,14 @@ This depends mainly on the language of the file to be annotated:
   of that construct the annotation will be remapped properly. If the enclosing
   construct is modified, the annotation will be invalidated.
 
-- For C sources, the annotations are currently not stable through modifications.
-  Any modification to the annotated source file will invalidate the annotations.
+- For Cor C++ sources, the annotations are tied to the inner-most enclosing
+  named declaration, such as a function declaration for C, or any of a
+  namespace declaration, a class declaration or function/method declaration for
+  C++.
+
+Note that in both cases, if no enclosing named construct can be found, the
+|gcvaddan| command will emit a warning and fall back to an absolute annotation,
+which is invalidated as soon as the file is modified.
 
 If an annotation is invalidated gnatcov will emit a warning stating that the
 annotation was ignored, along with its unique identifier.

testsuite/tests/Ada2022/aggregates/containers/src/pkg.adb

@@ -14,13 +14,13 @@ package body Pkg is
          declare
             Elt : constant Integer := Input.First_Element; -- # single_elt_st
          begin
-            return [(if Elt > 0 then Elt else Elt) =>      -- # single_elt_dc
-                    (if Elt > 0 then Elt else Elt)];       -- # single_elt_dc
+            return [(if Elt > 0 then Elt else Elt) =>      -- # single_elt_dc1
+                    (if Elt > 0 then Elt else Elt)];       -- # single_elt_dc2
          end;
       else
          return [for Elt of Input use                  -- # multi_elt_st
-                   (if Elt > 0 then Elt else Elt) =>   -- # multi_elt_dc
-                   (if Elt > 0 then Elt else Elt)];    -- # multi_elt_dc
+                   (if Elt > 0 then Elt else Elt) =>   -- # multi_elt_dc1
+                   (if Elt > 0 then Elt else Elt)];    -- # multi_elt_dc2
       end if;
    end Overly_Complex_Identity_Build;
 

testsuite/tests/Ada2022/aggregates/containers/src/pkg.ads

@@ -4,7 +4,7 @@ with Ada.Containers.Ordered_Sets;
 package Pkg is
 
    package Int_Maps is new Ada.Containers.Ordered_Maps
-     (Key_Type => Positive, Element_Type => Integer);
+     (Key_Type => Integer, Element_Type => Integer);
    subtype Int_Map is Int_Maps.Map;
 
    package Int_Sets is new Ada.Containers.Ordered_Sets

testsuite/tests/Ada2022/aggregates/containers/src/test_0.adb

@@ -12,6 +12,8 @@ end Test_0;
 -- /empty_aggr_st/    l- ## s-
 -- /single_elt_guard/ l- ## s-
 -- /single_elt_st/    l- ## s-
--- /single_elt_dc/    l- ## 0
+-- /single_elt_dc1/   l- ## s-
+-- /single_elt_dc2/   l- ## 0
 -- /multi_elt_st/     l- ## s-
--- /multi_elt_dc/     l- ## 0
+-- /multi_elt_dc1/    l- ## 0
+-- /multi_elt_dc2/    l- ## 0

testsuite/tests/Ada2022/aggregates/containers/src/test_empty.adb

@@ -15,6 +15,8 @@ end Test_Empty;
 -- /empty_aggr_st/    l+ ## 0
 -- /single_elt_guard/ l- ## s-
 -- /single_elt_st/    l- ## s-
--- /single_elt_dc/    l- ## 0
+-- /single_elt_dc1/   l- ## s-
+-- /single_elt_dc2/   l- ## 0
 -- /multi_elt_st/     l- ## s-
--- /multi_elt_dc/     l- ## 0
+-- /multi_elt_dc1/    l- ## 0
+-- /multi_elt_dc2/    l- ## 0

testsuite/tests/Ada2022/aggregates/containers/src/test_full.adb

@@ -18,6 +18,8 @@ end Test_Full;
 -- /empty_aggr_st/    l+ ## 0
 -- /single_elt_guard/ l+ ## 0
 -- /single_elt_st/    l+ ## 0
--- /single_elt_dc/    l+ ## 0
+-- /single_elt_dc1/   l+ ## 0
+-- /single_elt_dc2/   l+ ## 0
 -- /multi_elt_st/     l+ ## 0
--- /multi_elt_dc/     l+ ## 0
+-- /multi_elt_dc1/    l+ ## 0
+-- /multi_elt_dc2/    l+ ## 0

testsuite/tests/Ada2022/aggregates/containers/src/test_multi.adb

@@ -15,6 +15,8 @@ end Test_Multi;
 -- /empty_aggr_st/    l- ## s-
 -- /single_elt_guard/ l! ## dT-
 -- /single_elt_st/    l- ## s-
--- /single_elt_dc/    l- ## 0
+-- /single_elt_dc1/   l- ## s-
+-- /single_elt_dc2/   l- ## 0
 -- /multi_elt_st/     l+ ## 0
--- /multi_elt_dc/     l+ ## 0
+-- /multi_elt_dc1/    l+ ## 0
+-- /multi_elt_dc2/    l+ ## 0

testsuite/tests/Ada2022/aggregates/containers/src/test_single.adb

@@ -15,6 +15,8 @@ end Test_Single;
 -- /empty_aggr_st/    l- ## s-
 -- /single_elt_guard/ l! ## dF-
 -- /single_elt_st/    l+ ## 0
--- /single_elt_dc/    l! ## dF-
+-- /single_elt_dc1/   l! ## dF-
+-- /single_elt_dc2/   l! ## dF-
 -- /multi_elt_st/     l- ## s-
--- /multi_elt_dc/     l- ## 0
+-- /multi_elt_dc1/    l- ## 0
+-- /multi_elt_dc2/    l- ## 0

testsuite/tests/Ada2022/aggregates/containers/test.opt

@@ -1,2 +1 @@
-RTS_ZFP DEAD Test instantiates containers
-!RTS_ZFP XFAIL Compiler crash (eng/toolchain/gnat#1543)
+!native DEAD Test instantiates containers

testsuite/tests/ext_annotations/gen/c_ex/Nominal/test.py

@@ -28,7 +28,14 @@
     ),
 ]
 
-annot_file = generate_annotations(annotations)
+annot_file = generate_annotations(
+    annotations,
+    tolerate_messages=(
+        "warning: Could not create an auto-relocating annotation for src/"
+        "pkg.c:6:4 - 12:22, creating an absolute location annotation instead."
+    ),
+)
+
 
 # Check we get the expected results
 TestCase(category=CAT.mcdc).run(