diff options
| author | Martin Liska <mliska@suse.cz> | 2022-06-23 14:43:50 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-06-23 15:28:27 +0200 |
| commit | 8a15cd3396aa08dc2633982481fe392af0aa9e78 (patch) | |
| tree | 978d49983c8244b8cc480b48955f8f549574d2dd /gcc | |
| parent | c01fe6729e607fd064eb27db2a9420aedb75ffd4 (diff) | |
| download | gcc-8a15cd3396aa08dc2633982481fe392af0aa9e78.zip gcc-8a15cd3396aa08dc2633982481fe392af0aa9e78.tar.gz gcc-8a15cd3396aa08dc2633982481fe392af0aa9e78.tar.bz2 | |
c++: properly initialize UBSAN built-ins
PR c++/106062
gcc/ChangeLog:
* ubsan.cc (sanitize_unreachable_fn): Change order of calls
in order to initialize UBSAN built-ins.
gcc/testsuite/ChangeLog:
* gfortran.dg/ubsan/pr106062.f90: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/gfortran.dg/ubsan/pr106062.f90 | 11 | ||||
| -rw-r--r-- | gcc/ubsan.cc | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/testsuite/gfortran.dg/ubsan/pr106062.f90 b/gcc/testsuite/gfortran.dg/ubsan/pr106062.f90 new file mode 100644 index 0000000..879a67e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ubsan/pr106062.f90 @@ -0,0 +1,11 @@ +! PR c++/106062 +! { dg-do compile } +! { dg-options "-O2 -fsanitize=undefined" } + +call test (reshape ((/ 'a', 'b', 'c', 'd' /), (/ 2, 2 /))) +contains + subroutine test (a) + character (*), dimension (:, :) :: a + if (len (a) .ne. 1) STOP + end +end diff --git a/gcc/ubsan.cc b/gcc/ubsan.cc index f150268..b6c4301 100644 --- a/gcc/ubsan.cc +++ b/gcc/ubsan.cc @@ -654,9 +654,10 @@ sanitize_unreachable_fn (tree *data, location_t loc) } else if (san) { - fn = builtin_decl_explicit (BUILT_IN_UBSAN_HANDLE_BUILTIN_UNREACHABLE); + /* Call ubsan_create_data first as it initializes SANITIZER built-ins. */ *data = ubsan_create_data ("__ubsan_unreachable_data", 1, &loc, NULL_TREE, NULL_TREE); + fn = builtin_decl_explicit (BUILT_IN_UBSAN_HANDLE_BUILTIN_UNREACHABLE); *data = build_fold_addr_expr_loc (loc, *data); } else |