From: tkoenig Date: Sun, 21 Jan 2007 20:51:53 +0000 (+0000) Subject: 2007-01-21 Thomas Koenig X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e7a0a2305074f981877658ce8757f724543175b;p=thirdparty%2Fgcc.git 2007-01-21 Thomas Koenig PR libfortran/30525 * intrinsics/string_intrinsics.c(compare_string): Make sure that comparisons are done unsigned. 2007-01-21 Thomas Koenig PR libfortran/30525 * gfortran.dg/char_comparison_1.f: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121035 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d248286770ee..e92e40bcf4f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-01-21 Thomas Koenig + + PR libfortran/30525 + * gfortran.dg/char_comparison_1.f: New test. + 2007-01-21 Ira Rosen * gcc.dg/vect/vect-strided-same-dr.c: New test. diff --git a/gcc/testsuite/gfortran.dg/char_comparison_1.f b/gcc/testsuite/gfortran.dg/char_comparison_1.f new file mode 100644 index 000000000000..9a316b74f7d3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/char_comparison_1.f @@ -0,0 +1,26 @@ +C { dg-do run } +C PR 30525 - comparisons with padded spaces were done +C signed. + program main + character*2 c2 + character*1 c1, c3, c4 +C +C Comparison between char(255) and space padding +C + c2 = 'a' // char(255) + c1 = 'a' + if (.not. (c2 .gt. c1)) call abort +C +C Comparison between char(255) and space +C + c3 = ' ' + c4 = char(255) + if (.not. (c4 .gt. c3)) call abort + +C +C Check constant folding +C + if (.not. ('a' // char(255) .gt. 'a')) call abort + + if (.not. (char(255) .gt. 'a')) call abort + end diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index d81546ff47e0..f12f83ee441d 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2007-01-21 Thomas Koenig + + PR libfortran/30525 + * intrinsics/string_intrinsics.c(compare_string): Make + sure that comparisons are done unsigned. + 2006-12-09 Tobias Burnus PR libfortran/30015 diff --git a/libgfortran/intrinsics/string_intrinsics.c b/libgfortran/intrinsics/string_intrinsics.c index fdaddef33271..e432987dcad0 100644 --- a/libgfortran/intrinsics/string_intrinsics.c +++ b/libgfortran/intrinsics/string_intrinsics.c @@ -83,7 +83,7 @@ compare_string (GFC_INTEGER_4 len1, const char * s1, GFC_INTEGER_4 len2, const char * s2) { int res; - const char *s; + const unsigned char *s; int len; res = memcmp (s1, s2, (len1 < len2) ? len1 : len2); @@ -96,13 +96,13 @@ compare_string (GFC_INTEGER_4 len1, const char * s1, if (len1 < len2) { len = len2 - len1; - s = &s2[len1]; + s = (unsigned char *) &s2[len1]; res = -1; } else { len = len1 - len2; - s = &s1[len2]; + s = (unsigned char *) &s1[len2]; res = 1; }