From 5460b1030c86c2d328335f141dc2972c7ea9fd1e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 19 Jun 2019 10:22:29 +0200 Subject: [PATCH] * g++.dg/ubsan/pr63956.C: Adjust expected diagnostics. From-SVN: r272470 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/ubsan/pr63956.C | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8255d9e3751..72f34d8e616 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-06-19 Jakub Jelinek + + * g++.dg/ubsan/pr63956.C: Adjust expected diagnostics. + 2019-06-19 Jim MacArthur Mark Eggleston diff --git a/gcc/testsuite/g++.dg/ubsan/pr63956.C b/gcc/testsuite/g++.dg/ubsan/pr63956.C index 1aac3ec9a66..3a1596e6e2e 100644 --- a/gcc/testsuite/g++.dg/ubsan/pr63956.C +++ b/gcc/testsuite/g++.dg/ubsan/pr63956.C @@ -80,13 +80,13 @@ constexpr int fn5 (const int *a, int b) { if (b != 2) - b = a[b]; + b = a[b]; // { dg-error "array subscript" } return b; } constexpr int m1[4] = { 1, 2, 3, 4 }; constexpr int m2 = fn5 (m1, 3); -constexpr int m3 = fn5 (m1, 4); // { dg-error "array subscript|in .constexpr. expansion of " } +constexpr int m3 = fn5 (m1, 4); // { dg-message "in .constexpr. expansion of " } constexpr int fn6 (const int &a, int b) @@ -112,11 +112,11 @@ constexpr int fn8 (int i) { constexpr int g[10] = { }; - return g[i]; + return g[i]; // { dg-error "array subscript" } } constexpr int o1 = fn8 (9); -constexpr int o2 = fn8 (10); // { dg-error "array subscript|in .constexpr. expansion of " } +constexpr int o2 = fn8 (10); // { dg-message "in .constexpr. expansion of " } constexpr int fn9 (int a, int b) -- 2.30.2