Enable C++ instrumentation by default

Author: Jugst3r

testsuite/SUITE/tutils.py

@@ -735,15 +735,6 @@ def xcov(args, out=None, err=None, inp=None, env=None, register_failure=True,
     covcmd = args[0]
     covargs = args[1:]
 
-    # gnatcov testsuite exercises C/C++ instrumentation, which are not
-    # activated by default.
-    if (
-        auto_languages
-        and not thistest.options.qualif_level
-        and covcmd == "instrument"
-    ):
-        covargs = ['--restricted-to-languages=Ada,C,C++'] + covargs
-
     if thistest.options.all_warnings:
         covargs = ['--all-warnings'] + covargs
 

tools/gnatcov/Makefile

@@ -177,19 +177,19 @@ ifdef INSTRUMENTED
 	# use the version that was not instrumented as a main to compile
 	# gnatcov32, running gnatcov32 will not dump execution traces.
 
-	gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov64
+	gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov64 --c++-opts=$(CXXFLAGS)
 	$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov64 \
 	  --src-subdirs=gnatcov-instr
 
-	gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov32
+	gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov32 --c++-opts=$(CXXFLAGS)
 	$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov32 \
 	  --src-subdirs=gnatcov-instr
 
-	gnatcov instrument -j0 -P gnatcov.gpr -XPART=driver
+	gnatcov instrument -j0 -P gnatcov.gpr -XPART=driver --c++-opts=$(CXXFLAGS)
 	$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=driver \
 	  --src-subdirs=gnatcov-instr
 
-	gnatcov instrument -j0 -P gnatcov.gpr -XPART=compiler
+	gnatcov instrument -j0 -P gnatcov.gpr -XPART=compiler --c++-opts=$(CXXFLAGS)
 	$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=compiler \
 	  --src-subdirs=gnatcov-instr
 else

tools/gnatcov/command_line.ads

@@ -1277,9 +1277,7 @@ package Command_Line is
          Pattern                 => "[LANGUAGE|LIST|@LISTFILE]",
          Help                    =>
            "Restrict the set of languages for instrumentation. Supports Ada, C"
-           & " and C++. As C++ support is still in beta state, the default is"
-           & " --restricted-to-languages=Ada,C. To enable C++, pass"
-           & " --restricted-to-languages=Ada,C,C++.",
+           & " and C++.",
          Commands                => (Cmd_Setup
                                      | Cmd_Instrument_Project => True,
                                      others                   => False),

tools/gnatcov/gnatcov_bits_specific.adb

@@ -498,15 +498,10 @@ procedure GNATcov_Bits_Specific is
       --  just the default ones.
 
       if Args.String_List_Args (Opt_Restricted_To_Languages).Is_Empty then
-
-         --  C++ instrumentation is a beta feature and not yet fully
-         --  functional. It will thus not be part of the languages enabled by
-         --  default.
-
          Src_Enabled_Languages :=
            (Ada_Language => True,
             C_Language   => True,
-            CPP_Language => False);
+            CPP_Language => True);
       else
          for Arg of Args.String_List_Args (Opt_Restricted_To_Languages) loop
             Src_Enabled_Languages (To_Language (+Arg)) := True;