diff mbox

[MPX,2/X] Pointers Checker [20/25] Debug info

Message ID 20131118113650.GN21297@msticlxl57.ims.intel.com
State New
Headers show

Commit Message

Ilya Enkovich Nov. 18, 2013, 11:36 a.m. UTC 
Hi,

Here is a patch to avoid ICE in debug info generator for instrumented code.

Thanks,
Ilya
--
2013-11-15  Ilya Enkovich  <ilya.enkovich@intel.com>

	* dbxout.c (dbxout_type): Ignore POINTER_BOUNDS_TYPE.
	* dwarf2out.c (gen_subprogram_die): Ignore bound args.
	(gen_type_die_with_usage): Skip pointer bounds.
	(dwarf2out_global_decl): Likewise.

Comments

Cary Coutant Nov. 18, 2013, 5:43 p.m. UTC | #1 
> 2013-11-15  Ilya Enkovich  <ilya.enkovich@intel.com>
>
>         * dbxout.c (dbxout_type): Ignore POINTER_BOUNDS_TYPE.
>         * dwarf2out.c (gen_subprogram_die): Ignore bound args.
>         (gen_type_die_with_usage): Skip pointer bounds.
>         (dwarf2out_global_decl): Likewise.

The dwarf2out.c changes are OK. I'm not a dbx maintainer, but I'd
suggest that your patch to that file is trivial and obvious.

-cary
Jeff Law Nov. 18, 2013, 5:45 p.m. UTC | #2 
On 11/18/13 10:43, Cary Coutant wrote:
>> 2013-11-15  Ilya Enkovich  <ilya.enkovich@intel.com>
>>
>>          * dbxout.c (dbxout_type): Ignore POINTER_BOUNDS_TYPE.
>>          * dwarf2out.c (gen_subprogram_die): Ignore bound args.
>>          (gen_type_die_with_usage): Skip pointer bounds.
>>          (dwarf2out_global_decl): Likewise.
>
> The dwarf2out.c changes are OK. I'm not a dbx maintainer, but I'd
> suggest that your patch to that file is trivial and obvious.
The dbx changes are fine :-)

jeff
diff mbox

Patch

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 84f765e..2e97b9f 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -2365,6 +2365,10 @@  dbxout_type (tree type, int full)
       dbxout_type (TREE_TYPE (type), 0);
       break;
 
+    case POINTER_BOUNDS_TYPE:
+      /* No debug info for pointer bounds type supported yet.  */
+      break;
+
     default:
       gcc_unreachable ();
     }
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 3822a65..f7e97bf 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -18284,7 +18284,7 @@  gen_subprogram_die (tree decl, dw_die_ref context_die)
 	    gen_formal_parameter_pack_die (generic_decl_parm,
 					   parm, subr_die,
 					   &parm);
-	  else if (parm)
+	  else if (parm && !POINTER_BOUNDS_P (parm))
 	    {
 	      dw_die_ref parm_die = gen_decl_die (parm, NULL, subr_die);
 
@@ -18296,6 +18296,8 @@  gen_subprogram_die (tree decl, dw_die_ref context_die)
 
 	      parm = DECL_CHAIN (parm);
 	    }
+	  else if (parm)
+	    parm = DECL_CHAIN (parm);
 
 	  if (generic_decl_parm)
 	    generic_decl_parm = DECL_CHAIN (generic_decl_parm);
@@ -19794,6 +19796,7 @@  gen_type_die_with_usage (tree type, dw_die_ref context_die,
     case FIXED_POINT_TYPE:
     case COMPLEX_TYPE:
     case BOOLEAN_TYPE:
+    case POINTER_BOUNDS_TYPE:
       /* No DIEs needed for fundamental types.  */
       break;
 
@@ -20441,7 +20444,8 @@  dwarf2out_global_decl (tree decl)
      declarations, file-scope (extern) function declarations (which
      had no corresponding body) and file-scope tagged type declarations
      and definitions which have not yet been forced out.  */
-  if (TREE_CODE (decl) != FUNCTION_DECL || !DECL_INITIAL (decl))
+  if ((TREE_CODE (decl) != FUNCTION_DECL || !DECL_INITIAL (decl))
+      && !POINTER_BOUNDS_P (decl))
     dwarf2out_decl (decl);
 }