Bug 388526 -Inconsistent severity in message text: "WARNING: Serious error"

diff --git a/NEWS b/NEWS
index 8c44791005517b4695e82db9be53a5a6c5c96984..38c00488bfa5350b2fb8b59ef76964897fd3ebb1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 
 309554  Wrap syscall remap_file_pages (216)
 338803  Handling of dwz debug alt files or cross-CU is broken
+388526  Inconsistent severity in message text: "WARNING: Serious error"
 418756  MAP_FIXED_NOREPLACE mmap flag unsupported
 493430  Review all syscalls that use or return (new) file descriptors
 493434  Add --track-fds=bad mode (no "leak" tracking)

diff --git a/coregrind/m_debuginfo/storage.c b/coregrind/m_debuginfo/storage.c
index 22fed6d4f0fa47f4967a1f645af1485dcf8feba6..1db726be8d6e22d2a7d54af631afb19c43ca3665 100644 (file)
--- a/coregrind/m_debuginfo/storage.c
+++ b/coregrind/m_debuginfo/storage.c
@@ -69,19 +69,12 @@ void ML_(symerr) ( const DebugInfo* di, Bool serious, const HChar* msg )
       return;
 
    if (serious) {
-
-      VG_(message)(Vg_DebugMsg, "WARNING: Serious error when "
-                                "reading debug info\n");
-      if (True || VG_(clo_verbosity) < 2) {
-         /* Need to show what the file name is, at verbosity levels 2
-            or below, since that won't already have been shown */
-         VG_(message)(Vg_DebugMsg, 
-                      "When reading debug info from %s:\n",
-                      (di && di->fsm.filename) ? di->fsm.filename
-                                               : "???");
-      }
+      VG_(message)(Vg_DebugMsg,
+                   "WARNING: Serious problem when reading debug info from %s:\n",
+                   (di && di->fsm.filename) ? di->fsm.filename : "???");
+      VG_(message)(Vg_DebugMsg,
+                   "WARNING: Valgrind will continue to execute but error messages may be degraded.\n");
       VG_(message)(Vg_DebugMsg, "%s\n", msg);
-
    } else { /* !serious */
 
       if (VG_(clo_verbosity) >= 2)