From 75c040fdf4f97ea7aee7291d395eab695fa1ac3b Mon Sep 17 00:00:00 2001 From: No Author Date: Wed, 16 Feb 2005 23:07:47 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create branch 'gcc-3_4-branch'. From-SVN: r95122 --- gcc/testsuite/g++.dg/parse/local-class1.C | 14 +++ gcc/testsuite/g++.dg/template/explicit6.C | 8 ++ gcc/testsuite/gcc.dg/cpp/20050215-1.c | 10 ++ .../22_locale/ctype/narrow/char/19955.cc | 105 ++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/local-class1.C create mode 100644 gcc/testsuite/g++.dg/template/explicit6.C create mode 100644 gcc/testsuite/gcc.dg/cpp/20050215-1.c create mode 100644 libstdc++-v3/testsuite/22_locale/ctype/narrow/char/19955.cc diff --git a/gcc/testsuite/g++.dg/parse/local-class1.C b/gcc/testsuite/g++.dg/parse/local-class1.C new file mode 100644 index 000000000000..4fc7e6ebb131 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/local-class1.C @@ -0,0 +1,14 @@ + // Copyright (C) 2005 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 14 Feb 2005 + +// Origin: Jorn Wolfgang Rennecke +// Bug 19608: ICE on invalid + + +void f () +{ + class c + { + friend void g () { } // { dg-error "local class definition" "" } + }; +} diff --git a/gcc/testsuite/g++.dg/template/explicit6.C b/gcc/testsuite/g++.dg/template/explicit6.C new file mode 100644 index 000000000000..f740269bb749 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/explicit6.C @@ -0,0 +1,8 @@ +// Copyright (C) 2005 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 14 Feb 2005 + +// Origin: Volker Reichelt +// Bug 19895: ICE on invalid + +struct A; +template A<>::A(); // { dg-error "(not a template)|(explicit qualification)" "" } diff --git a/gcc/testsuite/gcc.dg/cpp/20050215-1.c b/gcc/testsuite/gcc.dg/cpp/20050215-1.c new file mode 100644 index 000000000000..e5aaf220e3e7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/cpp/20050215-1.c @@ -0,0 +1,10 @@ +/* Testcase for memory corruption bug in macro processing. + See PR preprocessor/19077 for details. */ + +/* { dg-do compile } */ +/* { dg-options "-g3" } */ +#define FOO(a,b,c,d,e) a b c d e \ +" " \ +" " \ +" " +int i; diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/19955.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/19955.cc new file mode 100644 index 000000000000..4ce1da33f01a --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/19955.cc @@ -0,0 +1,105 @@ +// Copyright (C) 2005 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// 22.2.1.3.2 ctype members + +#include +#include + +class Ctype1 +: public std::ctype +{ +protected: + const char* + do_narrow(const char* lo, const char* hi, + char dflt, char* to) const + { + for (int i = 0; lo != hi; ++lo, ++to, ++i) + *to = *lo + i; + return hi; + } +}; + +class Ctype2 +: public std::ctype +{ +protected: + const char* + do_narrow(const char* lo, const char* hi, + char dflt, char* to) const + { + for (int i = 0; lo != hi; ++lo, ++to, ++i) + if (*lo == '\000') + *to = dflt; + else + *to = *lo; + return hi; + } +}; + +// libstdc++/19955 +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + const char src[] = "abcd"; + + locale mylocale1(locale::classic(), new Ctype1); + const ctype& mc1 = use_facet >(mylocale1); + + char dst1[sizeof(src)]; + memset(dst1, 0, sizeof(src)); + char dst2[sizeof(src)]; + memset(dst2, 0, sizeof(src)); + + mc1.narrow(src, src + sizeof(src), '*', dst1); + mc1.narrow(src, src + sizeof(src), '*', dst2); + + VERIFY( !memcmp(dst1, "aceg\004", 5) ); + VERIFY( !memcmp(dst1, dst2, 5) ); + + locale mylocale2(locale::classic(), new Ctype2); + const ctype& mc2 = use_facet >(mylocale2); + + char dst3[sizeof(src)]; + memset(dst3, 0, sizeof(src)); + char dst4[sizeof(src)]; + memset(dst4, 0, sizeof(src)); + + mc2.narrow(src, src + sizeof(src), '*', dst3); + mc2.narrow(src, src + sizeof(src), '*', dst4); + + VERIFY( !memcmp(dst3, "abcd*", 5) ); + VERIFY( !memcmp(dst3, dst4, 5) ); +} + +int main() +{ + test01(); + return 0; +} -- 2.47.2