This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[mudflap] ignore-reads handling
- From: "Frank Ch. Eigler" <fche at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 17 Mar 2005 12:20:23 -0500
- Subject: [mudflap] ignore-reads handling
Hi -
This patch fills in a small loophole in ignore-reads checking that
Diego came across this morning. Committing to mainline.
+2005-03-17 Frank Ch. Eigler <fche@redhat.com>
+
+ * mf-runtime.c (__mfu_check): Respect ignore_reads configuration.
+ * testsuite/libmudflap.c/{pass56,fail39}-frag.c: New tests.
+
Index: mf-runtime.c
===================================================================
RCS file: /cvs/gcc/gcc/libmudflap/mf-runtime.c,v
retrieving revision 1.19
diff -u -p -r1.19 mf-runtime.c
--- mf-runtime.c 13 Oct 2004 18:27:14 -0000 1.19
+++ mf-runtime.c 17 Mar 2005 17:18:44 -0000
@@ -1,5 +1,5 @@
/* Mudflap: narrow-pointer bounds-checking by tree rewriting.
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by Frank Ch. Eigler <fche@redhat.com>
and Graydon Hoare <graydon@redhat.com>
Splay Tree code originally by Mark Mitchell <mark@markmitchell.com>,
@@ -813,6 +813,8 @@ void __mfu_check (void *ptr, size_t sz,
if (UNLIKELY (__mf_opts.sigusr1_report))
__mf_sigusr1_respond ();
+ if (UNLIKELY (__mf_opts.ignore_reads && type == 0))
+ return;
TRACE ("check ptr=%p b=%u size=%lu %s location=`%s'\n",
ptr, entry_idx, (unsigned long)sz,
Index: testsuite/libmudflap.c/fail39-frag.c
===================================================================
RCS file: testsuite/libmudflap.c/fail39-frag.c
diff -N testsuite/libmudflap.c/fail39-frag.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libmudflap.c/fail39-frag.c 17 Mar 2005 17:18:45 -0000
@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int main ()
+{
+ volatile int *k = (int *) malloc (sizeof (int));
+ volatile int l;
+ if (k == NULL) abort ();
+ *k = 5;
+ free ((void *) k);
+ __mf_set_options ("-ignore-reads");
+ l = *k; /* Should not trip, even though memory region just freed. */
+ __mf_set_options ("-no-ignore-reads");
+ l = *k; /* Should trip now. */
+ return 0;
+}
+/* { dg-output "mudflap violation 1.*check/read.*" } */
+/* { dg-output "Nearby object 1.*" } */
+/* { dg-output "mudflap dead object.*malloc region.*" } */
+/* { dg-do run { xfail *-*-* } } */
Index: testsuite/libmudflap.c/pass56-frag.c
===================================================================
RCS file: testsuite/libmudflap.c/pass56-frag.c
diff -N testsuite/libmudflap.c/pass56-frag.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libmudflap.c/pass56-frag.c 17 Mar 2005 17:18:45 -0000
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int main ()
+{
+ volatile int *k = (int *) malloc (sizeof (int));
+ volatile int l;
+ if (k == NULL) abort ();
+ *k = 5;
+ free ((void *) k);
+ __mf_set_options ("-ignore-reads");
+ l = *k; /* Should not trip, even though memory region just freed. */
+ return 0;
+}