From fbcdef51e4ec1b41966f4f27d633020a1d455eeb Mon Sep 17 00:00:00 2001
From: Henry Cox <henry.cox@mediatek.com>
Date: Mon, 16 Dec 2024 09:01:36 -0500
Subject: [PATCH] Improved location and context for certain messages:  more
 actionable.

Signed-off-by:  Henry Cox <henry.cox@mediatek.com>
---
 lib/lcovutil.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm
index 7d963032..028f10af 100644
--- a/lib/lcovutil.pm
+++ b/lib/lcovutil.pm
@@ -4666,10 +4666,12 @@ sub define_function
         #TraceFile::is_language('c', $self->filename()) &&
         $data->line() != $start_line
     ) {
+        $location = '"' . $self->filename() . '":' . $start_line
+            unless defined($location);
         lcovutil::ignorable_error($lcovutil::ERROR_INCONSISTENT_DATA,
-            (defined($location) ? "$location: " : '') .
-                "duplicate function '$fnName' starts on line $start_line but previous definition started on "
-                . $data->line() . '.')
+            "$location: duplicate function '$fnName' starts on line $start_line but previous definition started on "
+                . $data->line()
+                . MessageContext::context() . '.')
             unless
             grep({ $fnName =~ $_ } @lcovutil::suppress_function_patterns);
         # if ignored, just return the function we already have -
@@ -4698,7 +4700,8 @@ sub define_function
                                           " -> "
                                           .
                                           (defined($end_line) ? $end_line :
-                                               'undef'))
+                                               'undef') .
+                                          MessageContext::context())
                 unless
                 grep({ $fnName =~ $_ } @lcovutil::suppress_function_patterns);
             # pick the highest end line if we didn't error out