[committed] c++: Fix array-init1.C for ILP32 [PR93817]

Message ID 20200218210520.620619-1-polacek@redhat.com
State New
Headers show
Series
  • [committed] c++: Fix array-init1.C for ILP32 [PR93817]
Related show

Commit Message

Marek Polacek Feb. 18, 2020, 9:05 p.m.
I only tested LP64 targets and missed this maybe-long unsigned int.

Tested with
GXX_TESTSUITE_STDS=98,11,14,17,2a make check-c++ RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} dg.exp=array-init1.C'

2020-02-18  Marek Polacek  <polacek@redhat.com>

	PR c++/93817
	* g++.dg/diagnostic/array-init1.C: Fix for ILP32.
---
 gcc/testsuite/g++.dg/diagnostic/array-init1.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 855b4aaeabdcddce04ff9295c4b0e6c7aa6db96b
-- 
Marek Polacek • Red Hat, Inc. • 300 A St, Boston, MA

Patch

diff --git a/gcc/testsuite/g++.dg/diagnostic/array-init1.C b/gcc/testsuite/g++.dg/diagnostic/array-init1.C
index 78580ad6b83..11b91ec355e 100644
--- a/gcc/testsuite/g++.dg/diagnostic/array-init1.C
+++ b/gcc/testsuite/g++.dg/diagnostic/array-init1.C
@@ -7,5 +7,5 @@  int x;
 A a1[] = {
   0L, // { dg-error "3:conversion from .long int. to .A. is ambiguous" }
   &x, // { dg-error "3:invalid conversion from .int\\*. to .int." }
-  __builtin_offsetof (A, i) // { dg-error "23:conversion from .long unsigned int. to .A. is ambiguous" }
+  __builtin_offsetof (A, i) // { dg-error "23:conversion from .\(long \)?unsigned int. to .A. is ambiguous" }
 };