Add data_file to GCOV interm. format (PR gcov-profile/89961).

2019-04-08  Martin Liska  <mliska@suse.cz>

	PR gcov-profile/89961
	* doc/gcov.texi: Document data_file.
	* gcov.c (generate_results): Add data_info into JSON output.

From-SVN: r270204

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4c5520ecc1a4b8c07708fdc796d977c6d8a8897..b991f60048188b88b89da4891c0ba70baf3a89ce 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-08  Martin Liska  <mliska@suse.cz>
+
+       PR gcov-profile/89961
+       * doc/gcov.texi: Document data_file.
+       * gcov.c (generate_results): Add data_info into JSON output.
+
 2019-04-01  Bin Cheng  <bin.cheng@linux.alibaba.com>
 
        PR tree-optimization/89725

diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi
index ecad5d1184762c354d711cff4a4dddcefae145b0..e086c3084f93428aabe6ca131e502c5324fbb48c 100644 (file)
--- a/gcc/doc/gcov.texi
+++ b/gcc/doc/gcov.texi
@@ -192,6 +192,7 @@ Structure of the JSON is following:
 @smallexample
 @{
   "current_working_directory": @var{current_working_directory},
+  "data_file": @var{data_file},
   "format_version": @var{format_version},
   "gcc_version": @var{gcc_version}
   "files": [@var{file}]
@@ -205,6 +206,9 @@ Fields of the root element have following semantics:
 @var{current_working_directory}: working directory where
 a compilation unit was compiled
 
+@item
+@var{data_file}: name of the data file (GCDA)
+
 @item
 @var{format_version}: semantic version of the format
 

diff --git a/gcc/gcov.c b/gcc/gcov.c
index 1d576552a45dcb211340469142e83dbff754a185..1fc37a07c34eb5a25830f3d18a2c0fa9e61d4d56 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1421,6 +1421,7 @@ generate_results (const char *file_name)
 
   if (bbg_cwd != NULL)
     root->set ("current_working_directory", new json::string (bbg_cwd));
+  root->set ("data_file", new json::string (file_name));
 
   json::array *json_files = new json::array ();
   root->set ("files", json_files);