dwarflint: Fix what seems like malformed alignment test

diff --git a/dwarflint/check_debug_loc_range.cc b/dwarflint/check_debug_loc_range.cc
index cf5f91d8ec38c2fd0a894f0932e6e37082b9cd7b..8362a3c63ce46cd80bdfd32b6dd5abd601f30e39 100644 (file)
--- a/dwarflint/check_debug_loc_range.cc
+++ b/dwarflint/check_debug_loc_range.cc
@@ -993,21 +993,18 @@ found_hole (uint64_t start, uint64_t length, void *data)
     {
       /* Zero padding is valid, if it aligns on the bounds of
         info->align bytes, and is not excessive.  */
-      if (!(info->align != 0 && info->align != 1
-           && (end % info->align == 0) && (start % 4 != 0)
-           && (length < info->align)))
-       {
-         struct where wh = WHERE (info->section, NULL);
-         wr_message_padding_0 (info->category, wh, start, end);
-       }
+      if (info->align == 0 || info->align == 1
+         || length > info->align     // excessive
+         || end % info->align != 0   // doesn't actually align
+         || start % info->align == 0)// was already aligned
+       wr_message_padding_0 (info->category, section_locus (info->section),
+                             start, end);
     }
   else
-    {
-      /* XXX: This actually lies when the unreferenced portion is
-        composed of sequences of zeroes and non-zeroes.  */
-      struct where wh = WHERE (info->section, NULL);
-      wr_message_padding_n0 (info->category, wh, start, end);
-    }
+    /* XXX: This actually lies when the unreferenced portion is
+       composed of sequences of zeroes and non-zeroes.  */
+    wr_message_padding_n0 (info->category, section_locus (info->section),
+                          start, end);
 
   return true;
 }