From 0fba41e0f0b1fd1db24709577564866dec047c3b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 21 Jan 2019 17:58:04 +0100 Subject: [PATCH] utf-array.c: Allow wchar_t to be printed as {long ,short ,}{unsigned ,}int. * gcc.dg/utf-array.c: Allow wchar_t to be printed as {long ,short ,}{unsigned ,}int. From-SVN: r268117 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/utf-array.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3518747ee7b..653f3553214 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-21 Jakub Jelinek + + * gcc.dg/utf-array.c: Allow wchar_t to be printed as + {long ,short ,}{unsigned ,}int. + 2019-01-21 Richard Biener PR tree-optimization/88934 diff --git a/gcc/testsuite/gcc.dg/utf-array.c b/gcc/testsuite/gcc.dg/utf-array.c index 74a0c0c0e05..8687989a061 100644 --- a/gcc/testsuite/gcc.dg/utf-array.c +++ b/gcc/testsuite/gcc.dg/utf-array.c @@ -12,13 +12,13 @@ typedef __CHAR32_TYPE__ char32_t; const char s_0[] = "ab"; const char s_1[] = u"ab"; /* { dg-error "from a string literal with type array of" } */ const char s_2[] = U"ab"; /* { dg-error "from a string literal with type array of" } */ -const char s_3[] = L"ab"; /* { dg-error "from a string literal with type array of .int." } */ +const char s_3[] = L"ab"; /* { dg-error "from a string literal with type array of .(long |short )?(unsigned )?int." } */ const char s_4[] = u8"ab"; const char16_t s16_0[] = "ab"; /* { dg-error "from a string literal with type array of .char." } */ const char16_t s16_1[] = u"ab"; const char16_t s16_2[] = U"ab"; /* { dg-error "from a string literal with type array of" } */ -const char16_t s16_3[] = L"ab"; /* { dg-error "from a string literal with type array of .int." "" { target { ! wchar_t_char16_t_compatible } } } */ +const char16_t s16_3[] = L"ab"; /* { dg-error "from a string literal with type array of .(long |short )?(unsigned )?int." "" { target { ! wchar_t_char16_t_compatible } } } */ const char16_t s16_4[] = u8"ab"; /* { dg-error "from a string literal with type array of .char." } */ const char16_t s16_5[0] = u"ab"; /* { dg-warning "chars is too long" } */ @@ -30,7 +30,7 @@ const char16_t s16_9[4] = u"ab"; const char32_t s32_0[] = "ab"; /* { dg-error "from a string literal with type array of .char." } */ const char32_t s32_1[] = u"ab"; /* { dg-error "from a string literal with type array of" } */ const char32_t s32_2[] = U"ab"; -const char32_t s32_3[] = L"ab"; /* { dg-error "from a string literal with type array of .int." "" { target { ! wchar_t_char32_t_compatible } } } */ +const char32_t s32_3[] = L"ab"; /* { dg-error "from a string literal with type array of .(long |short )?(unsigned )?int." "" { target { ! wchar_t_char32_t_compatible } } } */ const char32_t s32_4[] = u8"ab"; /* { dg-error "from a string literal with type array of .char." } */ const char32_t s32_5[0] = U"ab"; /* { dg-warning "chars is too long" } */