Tweak some test coverage inclusions

Author: NWilson

.github/workflows/build.yml

@@ -539,6 +539,8 @@ jobs:
           submodules: true
 
       - name: Configure
+        # We use DEBUG=OFF here in order to suppress the coverage misses due to
+        # assertions, which obviously always pass.
         run: CC="clang -fprofile-instr-generate -fcoverage-mapping" cmake $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DPCRE2_DEBUG=OFF -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_SUPPORT_LIBZ=ON -DPCRE2_SUPPORT_LIBBZ2=ON -DPCRE2_SUPPORT_LIBEDIT=ON -DPCRE2_SUPPORT_LIBREADLINE=OFF -B build
 
       - name: Build

maint/FilterCoverage.py

@@ -27,6 +27,17 @@ def scan_exclusions(srcpath):
             continue
         if in_block:
             excl.add(i)
+
+        # If line matches '^\s*#(if|endif|else|elif)\b', exclude it.
+        # For some reason, Clang likes to output coverage for these lines,
+        # even though they have no executable code.
+        if re.match(r'^\s*#(if|endif|else|elif|ifdef|ifndef)\b', line):
+            excl.add(i)
+
+        # Similarly, Clang seems to generate DA entries for "}" lines inside
+        # switch statements. Exclude these too.
+        if re.match(r'^\s*}\s*(/\*.*?\*/)?$', line):
+            excl.add(i)
     return excl
 
 DA_RE = re.compile(r'^\s*DA:(\d+),(\d+)(,.*)?\s*$')

src/pcre2_context.c

@@ -502,10 +502,7 @@ return 0;
 }
 
 /* These functions became obsolete at release 10.30. The first is kept as a
-synonym for backwards compatibility. The second now does nothing. Exclude both
-from coverage reports. */
-
-/* LCOV_EXCL_START */
+synonym for backwards compatibility. The second now does nothing. */
 
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_set_recursion_limit(pcre2_match_context *mcontext, uint32_t limit)
@@ -525,8 +522,6 @@ pcre2_set_recursion_memory_management(pcre2_match_context *mcontext,
 return 0;
 }
 
-/* LCOV_EXCL_STOP */
-
 
 /* ------------ Convert context ------------ */
 

src/pcre2_util.h

@@ -71,6 +71,8 @@ side-effects. */
 } while(0)
 #endif
 
+/* LCOV_EXCL_START */
+
 /* PCRE2_UNREACHABLE() can be used to mark locations on the code that
 shouldn't be reached. In non debug builds is defined as a hint for
 the compiler to eliminate any code after it, so it is useful also for
@@ -107,8 +109,16 @@ the reason and the actions that should be taken if it ever triggers. */
 
 #define PCRE2_DEBUG_UNREACHABLE() PCRE2_UNREACHABLE()
 
+/* LCOV_EXCL_STOP */
+
 #endif /* PCRE2_DEBUG */
 
+#ifndef PCRE2_ASSERT
+#define PCRE2_ASSERT(x) do {} while(0)
+#endif
+
+/* LCOV_EXCL_START */
+
 #ifndef PCRE2_DEBUG_UNREACHABLE
 #define PCRE2_DEBUG_UNREACHABLE() do {} while(0)
 #endif
@@ -123,9 +133,7 @@ the reason and the actions that should be taken if it ever triggers. */
 #endif
 #endif /* !PCRE2_UNREACHABLE */
 
-#ifndef PCRE2_ASSERT
-#define PCRE2_ASSERT(x) do {} while(0)
-#endif
+/* LCOV_EXCL_STOP */
 
 /* We define this fallthrough macro for suppressing -Wimplicit-fallthrough warnings.
 Clang only allows this via an attribute, whereas other compilers (eg. GCC) match attributes

src/pcre2posix.c

@@ -331,10 +331,8 @@ preg->re_erroffset = (size_t)(-1);  /* No meaning after successful compile */
 
 if (preg->re_match_data == NULL)
   {
-  /* LCOV_EXCL_START */
   pcre2_code_free(preg->re_pcre2_code);
   return REG_ESPACE;
-  /* LCOV_EXCL_STOP */
   }
 
 return 0;