mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 22:41:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

sanopt.c (sanopt_optimize_walker): Limit removal of the checks.

Browse Source 
* sanopt.c (sanopt_optimize_walker): Limit removal of the checks.
	Remove vector limit.
testsuite/
	* c-c++-common/ubsan/align-2.c: Add dg-output.
	* c-c++-common/ubsan/align-4.c: Likewise.
	* c-c++-common/ubsan/align-6.c: New test.
	* c-c++-common/ubsan/align-7.c: New test.
	* c-c++-common/ubsan/align-8.c: New test.
	* g++.dg/ubsan/null-1.C: Add dg-output.
	* g++.dg/ubsan/null-2.C: Likewise.
	* g++.dg/ubsan/null-3.C: New test.
	* g++.dg/ubsan/null-4.C: New test.
	* g++.dg/ubsan/null-5.C: New test.

From-SVN: r217189
This commit is contained in:
Marek Polacek 2014-11-06 11:22:59 +00:00 committed by Marek Polacek
parent 32dee76568
commit 34896cd612
13 changed files with 204 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-06 Marek Polacek <polacek@redhat.com>
* sanopt.c (sanopt_optimize_walker): Limit removal of the checks.
Remove vector limit.
2014-11-06 Richard Biener <rguenther@suse.de>
* match.pd: Implement bitwise binary and unary simplifications

27
gcc/sanopt.c
View File

@ -130,7 +130,30 @@ sanopt_optimize_walker (basic_block bb, struct sanopt_ctx *ctx)
/* At this point we shouldn't have any statements
that aren't dominating the current BB. */
tree align = gimple_call_arg (g, 2);
remove = tree_int_cst_le (cur_align, align);
int kind = tree_to_shwi (gimple_call_arg (g, 1));
/* If this is a NULL pointer check where we had segv
anyway, we can remove it. */
if (integer_zerop (align)
&& (kind == UBSAN_LOAD_OF
|| kind == UBSAN_STORE_OF
|| kind == UBSAN_MEMBER_ACCESS))
remove = true;
/* Otherwise remove the check in non-recovering
mode, or if the stmts have same location. */
else if (integer_zerop (align))
remove = !(flag_sanitize_recover & SANITIZE_NULL)
|| flag_sanitize_undefined_trap_on_error
|| gimple_location (g)
== gimple_location (stmt);
else if (tree_int_cst_le (cur_align, align))
remove = !(flag_sanitize_recover
& SANITIZE_ALIGNMENT)
|| flag_sanitize_undefined_trap_on_error
|| gimple_location (g)
== gimple_location (stmt);
if (!remove && gimple_bb (g) == gimple_bb (stmt)
&& tree_int_cst_compare (cur_align, align) == 0)
v.pop ();
break;
}
}
@ -147,7 +170,7 @@ sanopt_optimize_walker (basic_block bb, struct sanopt_ctx *ctx)
}
gsi_remove (&gsi, true);
}
else if (v.length () < 30)
else
v.safe_push (stmt);
}
}

13
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,16 @@
2014-11-06 Marek Polacek <polacek@redhat.com>
* c-c++-common/ubsan/align-2.c: Add dg-output.
* c-c++-common/ubsan/align-4.c: Likewise.
* c-c++-common/ubsan/align-6.c: New test.
* c-c++-common/ubsan/align-7.c: New test.
* c-c++-common/ubsan/align-8.c: New test.
* g++.dg/ubsan/null-1.C: Add dg-output.
* g++.dg/ubsan/null-2.C: Likewise.
* g++.dg/ubsan/null-3.C: New test.
* g++.dg/ubsan/null-4.C: New test.
* g++.dg/ubsan/null-5.C: New test.
2014-11-06 Ilya Tocar <ilya.tocar@intel.com>
* gcc.target/i386/avx512vl-vandnpd-2.c: Fix

2
gcc/testsuite/c-c++-common/ubsan/align-2.c
View File

@ -51,4 +51,6 @@ main ()
/* { dg-output "\.c:(13|16):\[0-9]*: \[^\n\r]*store to misaligned address 0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
/* { dg-output "\.c:23:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:(29|30):\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:30:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:31:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:37:\[0-9]*: \[^\n\r]*load of misaligned address 0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment" } */

2
gcc/testsuite/c-c++-common/ubsan/align-4.c
View File

@ -9,4 +9,6 @@
/* { dg-output "\[^\n\r]*\.c:(13|16):\[0-9]*: \[^\n\r]*store to misaligned address 0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
/* { dg-output "\[^\n\r]*\.c:23:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\[^\n\r]*\.c:(29|30):\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\[^\n\r]*\.c:30:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\[^\n\r]*\.c:31:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\[^\n\r]*\.c:37:\[0-9]*: \[^\n\r]*load of misaligned address 0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment" } */

33
gcc/testsuite/c-c++-common/ubsan/align-6.c Normal file
View File

@ -0,0 +1,33 @@
/* Limit this to known non-strict alignment targets. */
/* { dg-do run { target { i?86-*-linux* x86_64-*-linux* } } } */
/* { dg-options "-O -fsanitize=alignment -fsanitize-recover=alignment" } */
struct S { int a; char b; long long c; short d[10]; };
struct T { char a; long long b; };
struct U { char a; int b; int c; long long d; struct S e; struct T f; } __attribute__((packed));
struct V { long long a; struct S b; struct T c; struct U u; } v;
__attribute__((noinline, noclone)) int
foo (struct S *p)
{
volatile int i;
i = p->a;
i = p->a;
i = p->a;
i = p->a;
return p->a;
}
int
main ()
{
if (foo (&v.u.e))
__builtin_abort ();
return 0;
}
/* { dg-output "\.c:14:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:15:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:17:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */

32
gcc/testsuite/c-c++-common/ubsan/align-7.c Normal file
View File

@ -0,0 +1,32 @@
/* Limit this to known non-strict alignment targets. */
/* { dg-do run { target { i?86-*-linux* x86_64-*-linux* } } } */
/* { dg-options "-O -fsanitize=alignment -fno-sanitize-recover=alignment -fdump-tree-sanopt-details" } */
/* { dg-shouldfail "ubsan" } */
struct S { int a; char b; long long c; short d[10]; };
struct T { char a; long long b; };
struct U { char a; int b; int c; long long d; struct S e; struct T f; } __attribute__((packed));
struct V { long long a; struct S b; struct T c; struct U u; } v;
__attribute__((noinline, noclone)) int
foo (struct S *p)
{
volatile int i;
i = p->a;
i = p->a;
i = p->a;
i = p->a;
return p->a;
}
int
main ()
{
if (foo (&v.u.e))
__builtin_abort ();
return 0;
}
/* { dg-output "\.c:15:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
/* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
/* { dg-final { cleanup-tree-dump "sanopt" } } */

31
gcc/testsuite/c-c++-common/ubsan/align-8.c Normal file
View File

@ -0,0 +1,31 @@
/* Limit this to known non-strict alignment targets. */
/* { dg-do run { target { i?86-*-linux* x86_64-*-linux* } } } */
/* { dg-options "-O -fsanitize=alignment -fsanitize-undefined-trap-on-error -fdump-tree-sanopt-details" } */
/* { dg-shouldfail "ubsan" } */
struct S { int a; char b; long long c; short d[10]; };
struct T { char a; long long b; };
struct U { char a; int b; int c; long long d; struct S e; struct T f; } __attribute__((packed));
struct V { long long a; struct S b; struct T c; struct U u; } v;
__attribute__((noinline, noclone)) int
foo (struct S *p)
{
volatile int i;
i = p->a;
i = p->a;
i = p->a;
i = p->a;
return p->a;
}
int
main ()
{
if (foo (&v.u.e))
__builtin_abort ();
return 0;
}
/* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
/* { dg-final { cleanup-tree-dump "sanopt" } } */

2
gcc/testsuite/g++.dg/ubsan/null-1.C
View File

@ -25,4 +25,6 @@ main (void)
}
// { dg-output "reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'const L'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }

2
gcc/testsuite/g++.dg/ubsan/null-2.C
View File

@ -35,3 +35,5 @@ main (void)
// { dg-output "\.C:26:\[0-9]*:\[\^\n\r]*member call on null pointer of type 'struct U'.*" }
// { dg-output "\.C:29:\[0-9]*:\[\^\n\r]*member call on null pointer of type 'struct V'.*" }
// { dg-output "\.C:31:\[0-9]*:\[\^\n\r]*member call on null pointer of type 'struct V'.*" }
// { dg-output "\.C:33:\[0-9]*:\[\^\n\r]*member call on null pointer of type 'struct V'" }

20
gcc/testsuite/g++.dg/ubsan/null-3.C Normal file
View File

@ -0,0 +1,20 @@
// { dg-do run }
// { dg-options "-fsanitize=null" }
int
main (void)
{
int *p = 0;
int &r1 = *p;
int &r2 = *p;
int &r3 = *p;
int &r4 = *p;
int &r5 = *p;
}
// { dg-output "reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }

19
gcc/testsuite/g++.dg/ubsan/null-4.C Normal file
View File

@ -0,0 +1,19 @@
// { dg-do run }
// { dg-options "-O -fsanitize=null -fno-sanitize-recover=null -fdump-tree-sanopt-details" }
// { dg-shouldfail "ubsan" }
int
main (void)
{
int *p = 0;
int &r1 = *p;
int &r2 = *p;
int &r3 = *p;
int &r4 = *p;
int &r5 = *p;
}
// { dg-output "reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
// { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} }
// { dg-final { cleanup-tree-dump "sanopt" } }

18
gcc/testsuite/g++.dg/ubsan/null-5.C Normal file
View File

@ -0,0 +1,18 @@
// { dg-do run }
// { dg-options "-O -fsanitize=null -fsanitize-undefined-trap-on-error -fdump-tree-sanopt-details" }
// { dg-shouldfail "ubsan" }
int
main (void)
{
int *p = 0;
int &r1 = *p;
int &r2 = *p;
int &r3 = *p;
int &r4 = *p;
int &r5 = *p;
}
// { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} }
// { dg-final { cleanup-tree-dump "sanopt" } }