[3/4] c: runtime checking for assigment of VM types 3/4

Message ID	5af943163b8c49f75022e2bae151c18afd4b7c0c.camel@tugraz.at
State	New
Headers	show Return-Path: <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org> DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 89B0C3858421 Message-ID: <5af943163b8c49f75022e2bae151c18afd4b7c0c.camel@tugraz.at> Subject: [PATCH 3/4] c: runtime checking for assigment of VM types 3/4 From: Martin Uecker <uecker@tugraz.at> To: gcc-patches@gcc.gnu.org Cc: Joseph Myers <joseph@codesourcery.com> Date: Sat, 18 Nov 2023 22:13:44 +0100 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 Precedence: list Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org
Series	[1/4] c: runtime checking for assigment of VM types 1/4 \| expand [1/4] c: runtime checking for assigment of VM types 1/4 [2/4] c: runtime checking for assigment of VM types 2/4 [3/4] c: runtime checking for assigment of VM types 3/4 [4/4] c: runtime checking for assigment of VM types 4/4

diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index 64d3a941cb9..84a30f7476a 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -8549,6 +8549,10 @@ get_parm_info (bool ellipsis, tree expr) declared types. The back end may override this later. */ DECL_ARG_TYPE (decl) = type; types = tree_cons (0, type, types); + + /* Record the decl for use for VLA bounds checking. */ + if (flag_vla_bounds) + TREE_PURPOSE (types) = decl; } break; diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index b65fc450940..1200abc2f4a 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -3472,9 +3472,19 @@ process_vm_constraints (location_t location, } else { - /* Functions called via pointers are not yet supported. */ - return void_node; + while (FUNCTION_TYPE != TREE_CODE (function)) + function = TREE_TYPE (function); + + args = TREE_PURPOSE (TYPE_ARG_TYPES (function)); + + if (!args) + { + /* FIXME: this can happen when forming composite types for the + conditional operator. */ + return void_node; + } } + gcc_assert (PARM_DECL == TREE_CODE (args)); } for (struct instrument_data* d = *instr_vec; d; d = d->next) diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr-1.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-1.c new file mode 100644 index 00000000000..b9af87f6338 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-1.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +TRY( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +ERROR( (*p)(3, &A0); ) // 4 != 3 +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr-2.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-2.c new file mode 100644 index 00000000000..4ec326af06c --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-2.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +TRY( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +ERROR( (*p)(3, &A0); ) // 4 != 3 +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr-3.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-3.c new file mode 100644 index 00000000000..9e28a8e4db7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-3.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +TRY( (*p)(3, &A0); ) // 4 != 3 +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr-4.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-4.c new file mode 100644 index 00000000000..7f70b53cc4c --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-4.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +ERROR( (*p)(3, &A0); ) // 4 != 3 +TRY( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr-5.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-5.c new file mode 100644 index 00000000000..012d32ff234 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr-5.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +ERROR( (*p)(3, &A0); ) // 4 != 3 +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +TRY( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-fnptr.c b/gcc/testsuite/gcc.dg/vla-bounds-fnptr.c new file mode 100644 index 00000000000..9d102673c94 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-bounds-fnptr.c @@ -0,0 +1,78 @@ +/* { dg-do run } */ +/* { dg-options "-fvla-bounds" } */ + +#include <signal.h> +#include <stdlib.h> + +static void handler(int) { exit(0); } + +#define TRY(...) __VA_ARGS__ __builtin_abort(); +#define ERROR(...) + + + +void foo1(void (*p)(int n, char (*a)[n])) +{ + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void b0(int n, char (*a)[n]) { } + + +int n; + +void foo2(void (*p)(int n, char (*a)[n])) +{ + n = 4; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo3(void (*p)(int n0, char (*a)[n])) +{ + n = 4; + char A0[3]; +ERROR( (*p)(3, &A0); ) // 4 != 3 +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + +void foo4(void (*p)(int n, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); +ERROR( (*p)(4, &A0); ) // 4 != 3 +} + + +void foo5(void (*p)(int n0, char (*a)[n])) +{ + n = 3; + char A0[3]; + (*p)(3, &A0); + (*p)(4, &A0); +} + + +void b1(int n0, char (*a)[n]) { } + + + +int main() +{ + signal(SIGILL, handler); + + foo1(&b0); + + foo2(&b1); + foo3(&b1); // we should diagnose mismatch and run-time discrepancies + + foo4(&b1); + foo5(&b1); // we should diagnose mismatch and run-time discrepancies +} + + + diff --git a/gcc/testsuite/gcc.dg/vla-bounds-func-1.c b/gcc/testsuite/gcc.dg/vla-bounds-func-1.c index dd5f3e76b50..72dba39107b 100644 --- a/gcc/testsuite/gcc.dg/vla-bounds-func-1.c +++ b/gcc/testsuite/gcc.dg/vla-bounds-func-1.c @@ -31,7 +31,7 @@ void f(void) int u = 3; int v = 4; char a[u][v]; - (1 ? f1 : f2)(u, v, a); + (1 ? f1 : f2)(u, v, a); /* "Function call not instrumented." */ } /* size expression in parameter */

[3/4] c: runtime checking for assigment of VM types 3/4

Commit Message

Patch