Patchwork [asan] Patch - fix an ICE in asan.c

login
register
mail settings
Submitter Jakub Jelinek
Date Nov. 12, 2012, 6:02 p.m.
Message ID <20121112180258.GQ1886@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/198436/
State New
Headers show

Comments

Jakub Jelinek - Nov. 12, 2012, 6:02 p.m.
On Mon, Nov 12, 2012 at 06:13:08PM +0100, Markus Trippelsdorf wrote:
> Another ICE:
> 
>  % cat test.ii
>  int i;
> 
>  % g++ -faddress-sanitizer -c -g -O1 test.ii
> test.ii:1:7: internal compiler error: Segmentation fault
>   int i;
>        ^

The RECORD_TYPE doesn't have lang specific payload allocated for it.
There is no point why we need to describe that in the debug info though.

So I'd do something like:

2012-11-12  Jakub Jelinek  <jakub@redhat.com>

	* asan.c (report_error_func): Set DECL_IGNORED_P, don't touch
	DECL_ASSEMBLER_NAME.
	(asan_init_func): Likewise.
	(asan_finish_file): Use void * instead of __asan_global * as
	type of __asan_{,un}register_globals.  Set DECL_IGNORED_P on
	the decls.



	Jakub
Dodji Seketeli - Nov. 15, 2012, 1:07 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> 2012-11-12  Jakub Jelinek  <jakub@redhat.com>
>
> 	* asan.c (report_error_func): Set DECL_IGNORED_P, don't touch
> 	DECL_ASSEMBLER_NAME.
> 	(asan_init_func): Likewise.
> 	(asan_finish_file): Use void * instead of __asan_global * as
> 	type of __asan_{,un}register_globals.  Set DECL_IGNORED_P on
> 	the decls.

This looks OK to me.

Thanks!

Patch

--- gcc/asan.c.jj	2012-11-12 17:39:19.000000000 +0100
+++ gcc/asan.c	2012-11-12 18:54:57.164914324 +0100
@@ -493,10 +493,10 @@  report_error_func (bool is_store, int si
   fn_type = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE);
   def = build_fn_decl (name, fn_type);
   TREE_NOTHROW (def) = 1;
+  DECL_IGNORED_P (def) = 1;
   TREE_THIS_VOLATILE (def) = 1;  /* Attribute noreturn. Surprise!  */
   DECL_ATTRIBUTES (def) = tree_cons (get_identifier ("leaf"),
 				     NULL, DECL_ATTRIBUTES (def));
-  DECL_ASSEMBLER_NAME (def);
   return def;
 }
 
@@ -511,7 +511,7 @@  asan_init_func (void)
   fn_type = build_function_type_list (void_type_node, NULL_TREE);
   def = build_fn_decl ("__asan_init", fn_type);
   TREE_NOTHROW (def) = 1;
-  DECL_ASSEMBLER_NAME (def);
+  DECL_IGNORED_P (def) = 1;
   return def;
 }
 
@@ -1535,11 +1535,11 @@  asan_finish_file (void)
       DECL_INITIAL (var) = ctor;
       varpool_assemble_decl (varpool_node_for_decl (var));
 
-      type = build_function_type_list (void_type_node,
-				       build_pointer_type (TREE_TYPE (type)),
+      type = build_function_type_list (void_type_node, ptr_type_node,
 				       uptr, NULL_TREE);
       decl = build_fn_decl ("__asan_register_globals", type);
       TREE_NOTHROW (decl) = 1;
+      DECL_IGNORED_P (decl) = 1;
       append_to_statement_list (build_call_expr (decl, 2,
 						 build_fold_addr_expr (var),
 						 build_int_cst (uptr, gcount)),
@@ -1547,6 +1547,7 @@  asan_finish_file (void)
 
       decl = build_fn_decl ("__asan_unregister_globals", type);
       TREE_NOTHROW (decl) = 1;
+      DECL_IGNORED_P (decl) = 1;
       append_to_statement_list (build_call_expr (decl, 2,
 						 build_fold_addr_expr (var),
 						 build_int_cst (uptr, gcount)),