This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix for char16_t/char32_t conversion tests on 64-bit archs
- From: Kris Van Hees <kris dot van dot hees at oracle dot com>
- To: dominiq at lps dot ens dot fr
- Cc: pinskia at gcc dot gnu dot org, hjl dot tools at gmail dot com, gcc-patches at gcc dot gnu dot org
- Date: Mon, 21 Apr 2008 07:06:43 -0400
- Subject: [PATCH] Fix for char16_t/char32_t conversion tests on 64-bit archs
Oracle has a full copyright assignment in place with the FSF.
This patch addresses the problem reported in PR testsuite/35981:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35981
The tests for conversion did not appropriately consider 64-bit platforms,
nor did it include testing for 'long long'. This patch addresses both
problems.
ChangeLog entries:
------------------
gcc/testsuite/ChangeLog:
2008-04-20 Kris Van Hees <kris.van.hees@oracle.com>
PR testsuite/35981
* g++.dg/ext/utf-cvt.C: Handle 64-bit platforms correctly.
Add tests for 'long long'.
* gcc.dg/utf-cvt.c: Handle 64-bit platforms correctly.
Add tests for 'long long'.
Bootstrapping and testing:
--------------------------
The source tree was built on the following platforms (target == host):
i686-linux
x86_64-linux
Builds were done for both the unpatched tree and the patched tree, and
testsuite (make -k check) summary results were verified to be identical,
except for the added tests in the patched tree. This was done to ensure
that the patch does not introduce regressions.
Index: gcc/testsuite/gcc.dg/utf-cvt.c
===================================================================
--- gcc/testsuite/gcc.dg/utf-cvt.c (revision 134495)
+++ gcc/testsuite/gcc.dg/utf-cvt.c (working copy)
@@ -3,8 +3,8 @@
/* { dg-do compile } */
/* { dg-options "-std=gnu99 -Wall -Wconversion -Wsign-conversion" } */
-typedef unsigned short char16_t;
-typedef unsigned int char32_t;
+typedef short unsigned int char16_t;
+typedef unsigned int char32_t;
extern void f_c (char);
extern void fsc (signed char);
@@ -18,14 +18,17 @@ extern void fui (unsigned int);
extern void f_l (long);
extern void fsl (signed long);
extern void ful (unsigned long);
+extern void f_ll (long long);
+extern void fsll (signed long long);
+extern void full (unsigned long long);
void m (char16_t c0, char32_t c1)
{
- f_c (c0); /* { dg-warning "alter its value" } */
- fsc (c0); /* { dg-warning "alter its value" } */
- fuc (c0); /* { dg-warning "alter its value" } */
- f_s (c0); /* { dg-warning "change the sign" } */
- fss (c0); /* { dg-warning "change the sign" } */
+ f_c (c0); /* { dg-warning "alter its value" } */
+ fsc (c0); /* { dg-warning "alter its value" } */
+ fuc (c0); /* { dg-warning "alter its value" } */
+ f_s (c0); /* { dg-warning "change the sign" } */
+ fss (c0); /* { dg-warning "change the sign" } */
fus (c0);
f_i (c0);
fsi (c0);
@@ -33,17 +36,23 @@ void m (char16_t c0, char32_t c1)
f_l (c0);
fsl (c0);
ful (c0);
+ f_ll (c0);
+ fsll (c0);
+ full (c0);
- f_c (c1); /* { dg-warning "alter its value" } */
- fsc (c1); /* { dg-warning "alter its value" } */
- fuc (c1); /* { dg-warning "alter its value" } */
- f_s (c1); /* { dg-warning "alter its value" } */
- fss (c1); /* { dg-warning "alter its value" } */
- fus (c1); /* { dg-warning "alter its value" } */
- f_i (c1); /* { dg-warning "change the sign" } */
- fsi (c1); /* { dg-warning "change the sign" } */
+ f_c (c1); /* { dg-warning "alter its value" } */
+ fsc (c1); /* { dg-warning "alter its value" } */
+ fuc (c1); /* { dg-warning "alter its value" } */
+ f_s (c1); /* { dg-warning "alter its value" } */
+ fss (c1); /* { dg-warning "alter its value" } */
+ fus (c1); /* { dg-warning "alter its value" } */
+ f_i (c1); /* { dg-warning "change the sign" } */
+ fsi (c1); /* { dg-warning "change the sign" } */
fui (c1);
- f_l (c1); /* { dg-warning "change the sign" } */
- fsl (c1); /* { dg-warning "change the sign" } */
+ f_l (c1); /* { dg-warning "change the sign" "" { target { ilp32 } } } */
+ fsl (c1); /* { dg-warning "change the sign" "" { target { ilp32 } } } */
ful (c1);
+ f_ll (c1);
+ fsll (c1);
+ full (c1);
}
Index: gcc/testsuite/g++.dg/ext/utf-cvt.C
===================================================================
--- gcc/testsuite/g++.dg/ext/utf-cvt.C (revision 134495)
+++ gcc/testsuite/g++.dg/ext/utf-cvt.C (working copy)
@@ -15,14 +15,17 @@ extern void fui (unsigned int);
extern void f_l (long);
extern void fsl (signed long);
extern void ful (unsigned long);
+extern void f_ll (long long);
+extern void fsll (signed long long);
+extern void full (unsigned long long);
void m(char16_t c0, char32_t c1)
{
- f_c (c0); /* { dg-warning "alter its value" } */
- fsc (c0); /* { dg-warning "alter its value" } */
- fuc (c0); /* { dg-warning "alter its value" } */
- f_s (c0); /* { dg-warning "change the sign" } */
- fss (c0); /* { dg-warning "change the sign" } */
+ f_c (c0); /* { dg-warning "alter its value" } */
+ fsc (c0); /* { dg-warning "alter its value" } */
+ fuc (c0); /* { dg-warning "alter its value" } */
+ f_s (c0); /* { dg-warning "change the sign" } */
+ fss (c0); /* { dg-warning "change the sign" } */
fus (c0);
f_i (c0);
fsi (c0);
@@ -30,17 +33,23 @@ void m(char16_t c0, char32_t c1)
f_l (c0);
fsl (c0);
ful (c0);
+ f_ll (c0);
+ fsll (c0);
+ full (c0);
- f_c (c1); /* { dg-warning "alter its value" } */
- fsc (c1); /* { dg-warning "alter its value" } */
- fuc (c1); /* { dg-warning "alter its value" } */
- f_s (c1); /* { dg-warning "alter its value" } */
- fss (c1); /* { dg-warning "alter its value" } */
- fus (c1); /* { dg-warning "alter its value" } */
- f_i (c1); /* { dg-warning "change the sign" } */
- fsi (c1); /* { dg-warning "change the sign" } */
+ f_c (c1); /* { dg-warning "alter its value" } */
+ fsc (c1); /* { dg-warning "alter its value" } */
+ fuc (c1); /* { dg-warning "alter its value" } */
+ f_s (c1); /* { dg-warning "alter its value" } */
+ fss (c1); /* { dg-warning "alter its value" } */
+ fus (c1); /* { dg-warning "alter its value" } */
+ f_i (c1); /* { dg-warning "change the sign" } */
+ fsi (c1); /* { dg-warning "change the sign" } */
fui (c1);
- f_l (c1); /* { dg-warning "change the sign" } */
- fsl (c1); /* { dg-warning "change the sign" } */
+ f_l (c1); /* { dg-warning "change the sign" "" { target { ilp32 } } } */
+ fsl (c1); /* { dg-warning "change the sign" "" { target { ilp32 } } } */
ful (c1);
+ f_ll (c1);
+ fsll (c1);
+ full (c1);
}