[03/11] Emit GIMPLE directly instead of gimplifying GENERIC.

From: Jakub Jelinek <jakub@redhat.com>

[I am replying to several emails at once as I believe they are logically
connected]

Tobias Burnus <burnus@net-b.de> writes:

> I tried the 01/10 to 10/10 patch series but it doesn't trigger for the
> following test case:
>
> #include <stdlib.h>
> #include <stdio.h>
>
> int
> main() {
>   int *i;
>   i = malloc(10*sizeof(*i));
>   free(i);  /* <<< Free memory. */
>   i[10] = 5;  /* <<< out of boundary even if not freed. */
>   printf("%d\n", i[11]);  /* <<< out of boundary even if not freed. */
>   return 0;
> }
>
> (All of them are reported by Clang.) If I look at the dump (or
> assembler), I see the call to __asan_init, __asan_report_store4 and
> __asan_report_load4. However, when running the program ltrace only
> shows the calls to: __libc_start_main, __asan_init, malloc, free and
> printf. I haven't debugged why the condition is false [see attachment
> for the dump].

Right. As David Xinliang says ...

Xinliang David Li <davidxl@google.com> writes:

> It seems that my one line fix in asan branch (r192605) is not included
> in Dodji's patch set.

That's right.

... I meant to 'squash' this patch into ...

    From 72ed51c18dd269ee10fa1b70a919d77de498fc06 Mon Sep 17 00:00:00 2001
    From: Jakub Jelinek <jakub@redhat.com>
    Date: Fri, 2 Nov 2012 23:29:30 +0100
    Subject: [PATCH 03/11] Emit GIMPLE directly instead of gimplifying GENERIC.

    This patch cleanups the instrumentation code generation by emitting
    GIMPLE directly, as opposed to emitting GENERIC tree and then
    gimplifying them.  It also does some cleanups here and there

            * Makefile.in (GTFILES): Add $(srcdir)/asan.c.
            (asan.o): Update the dependencies of asan.o.
            * asan.c (tm.h, tree.h, tm_p.h, basic-block.h, flags.h
            function.h, tree-inline.h, tree-dump.h, diagnostic.h, demangle.h,
            langhooks.h, ggc.h, cgraph.h, gimple.h): Remove these unused but
            included headers.
            (shadow_ptr_types): New variable.
            (report_error_func): Change is_store argument to bool, don't append
            newline to function name.
            (PROB_VERY_UNLIKELY, PROB_ALWAYS): Define.
            (build_check_stmt): Change is_store argument to bool.  Emit GIMPLE
            directly instead of creating trees and gimplifying them.  Mark
            the error reporting function as very unlikely.
            (instrument_derefs): Change is_store argument to bool.  Use
            int_size_in_bytes to compute size_in_bytes, simplify size check.
            Use build_fold_addr_expr instead of build_addr.
            (transform_statements): Adjust instrument_derefs caller.
            Use gimple_assign_single_p as stmt test.  Don't look at MEM refs
            in rhs2.
            (asan_init_shadow_ptr_types): New function.
            (asan_instrument): Don't push/pop gimplify context.
            Call asan_init_shadow_ptr_types if not yet initialized.
            * asan.h (ASAN_SHADOW_SHIFT): Adjust comment.

... this one, to comply with Joseph's comment (in another sub-thread)
which was requesting to avoid sending patches that are knowingly broken
for the sake of sending them chronologically; but I obviously forgot to
do so.

It's now fixed and here is the updated patch that combines both commits:

	* Makefile.in (GTFILES): Add $(srcdir)/asan.c.
	(asan.o): Update the dependencies of asan.o.
	* asan.c (tm.h, tree.h, tm_p.h, basic-block.h, flags.h
	function.h, tree-inline.h, tree-dump.h, diagnostic.h, demangle.h,
	langhooks.h, ggc.h, cgraph.h, gimple.h): Remove these unused but
	included headers.
	(shadow_ptr_types): New variable.
	(report_error_func): Change is_store argument to bool, don't append
	newline to function name.
	(PROB_VERY_UNLIKELY, PROB_ALWAYS): Define.
	(build_check_stmt): Change is_store argument to bool.  Emit GIMPLE
	directly instead of creating trees and gimplifying them.  Mark
	the error reporting function as very unlikely.
	(instrument_derefs): Change is_store argument to bool.  Use
	int_size_in_bytes to compute size_in_bytes, simplify size check.
	Use build_fold_addr_expr instead of build_addr.
	(transform_statements): Adjust instrument_derefs caller.
	Use gimple_assign_single_p as stmt test.  Don't look at MEM refs
	in rhs2.
	(asan_init_shadow_ptr_types): New function.
	(asan_instrument): Don't push/pop gimplify context.
	Call asan_init_shadow_ptr_types if not yet initialized.
	* asan.h (ASAN_SHADOW_SHIFT): Adjust comment.
---
 gcc/ChangeLog.asan |  28 ++++++
 gcc/Makefile.in    |   9 +-
 gcc/asan.c         | 284 +++++++++++++++++++++++++++++++----------------------
 gcc/asan.h         |   2 +-
 4 files changed, 200 insertions(+), 123 deletions(-)

[03/11] Emit GIMPLE directly instead of gimplifying GENERIC.

Commit Message

Patch