i#573,i#1636 annotations: add leak check annotation handling

Adds a handler for the VALGRIND_DO_LEAK_CHECK annotation, for use in our
tests.  Requires DR 4050f4f.

Review-URL: https://codereview.appspot.com/262490044

Author: derekbruening

drheapstat/drheapstat.c

@@ -1954,8 +1954,8 @@ event_post_syscall(void *drcontext, int sysnum)
     handle_post_alloc_syscall(drcontext, sysnum, mc);
 }
 
-static void
-check_for_leaks(bool at_exit)
+void
+check_reachability(bool at_exit)
 {
     if (options.check_leaks) {
         void *drcontext = dr_get_current_drcontext();
@@ -2032,7 +2032,7 @@ event_nudge(void *drcontext, uint64 argument)
     dr_fprintf(f_nudge, "%d,%"INT64_FORMAT"u,%"INT64_FORMAT"u\n",
                nudge_count, snapshot_fpos, staleness_fpos);
     malloc_unlock();
-    check_for_leaks(false/*!at_exit*/);
+    check_reachability(false/*!at_exit*/);
     print_nudge_header(f_global);
     NOTIFY("Received nudge"NL, logsubdir);
 }
@@ -2132,7 +2132,7 @@ event_exit(void)
     }
     snapshot_exit();
     if (options.check_leaks) {
-        check_for_leaks(true/*at_exit*/);
+        check_reachability(true/*at_exit*/);
         leak_exit();
     }
 

drmemory/alloc_drmem.h

@@ -27,6 +27,8 @@
 #ifndef _ALLOC_DRMEM_H_
 #define _ALLOC_DRMEM_H_ 1
 
+#include "callstack.h" /* app_loc_t */
+
 #ifdef UNIX
 extern hashtable_t sighand_table;
 #endif

drmemory/annotations.c

@@ -38,6 +38,11 @@
 #include "utils.h"
 #include "shadow.h"
 #include "options.h"
+#ifdef TOOL_DR_MEMORY
+# include "alloc_drmem.h"
+#else
+extern void check_reachability(bool at_exit);
+#endif
 
 #ifndef ARM /* FIXME DRi#1672: add ARM annotation support to DR */
 static ptr_uint_t
@@ -61,6 +66,14 @@ handle_make_mem_defined_if_addressable(dr_vg_client_request_t *request)
      */
     return 1;
 }
+
+static ptr_uint_t
+handle_do_leak_check(dr_vg_client_request_t *request)
+{
+    LOG(2, "%s\n", __FUNCTION__);
+    check_reachability(false/*!at_exit*/);
+    return 0;
+}
 #endif
 
 void
@@ -71,6 +84,8 @@ annotate_init(void)
 # ifndef ARM /* FIXME DRi#1672: add ARM annotation support to DR */
     dr_annotation_register_valgrind(DR_VG_ID__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
                                     handle_make_mem_defined_if_addressable);
+    dr_annotation_register_valgrind(DR_VG_ID__DO_LEAK_CHECK,
+                                    handle_do_leak_check);
 # endif
 #endif
 }

drmemory/docs/release.dox

@@ -70,7 +70,8 @@ The changes between \TOOL_VERSION and version 1.8.0 include:
  - Switched the Windows installer from an NSIS-based executable to
    a WIX-based .msi file.  The new installer automatically adds
    Dr. Memory to the PATH for the current user.
- - Added unaddressable warning report on write-to-readonly-memory.
+ - Added an unaddressable warning report on a write to read-only memory.
+ - Added support for the VALGRIND_DO_LEAK_CHECK annotation.
 
 The changes between version 1.8.0 and version 1.7.0 include:
  - Dropped official support for Windows 2000.

third_party/valgrind/memcheck.h

@@ -184,7 +184,7 @@ typedef
 
 /* Do a full memory leak check (like --leak-check=full) mid-execution. */
 #define VALGRIND_DO_LEAK_CHECK                                   \
-   {unsigned long _qzz_res;                                      \
+   {__attribute__((unused)) unsigned long _qzz_res;              \
     VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0,                      \
                             VG_USERREQ__DO_LEAK_CHECK,           \
                             0, 0, 0, 0, 0);                      \