Fix fallouts of the last merge.

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/fc5-4_1-branch@120554 138bc75d-0d04-0410-961f-82ee72b054a4

21 files changed, 0 insertions, 433 deletions

diff --git a/gcc/testsuite/g++.dg/ext/visibility/anon1.C b/gcc/testsuite/g++.dg/ext/visibility/anon1.C
deleted file mode 100644
index 16647b22814..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/anon1.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// PR c++/21581
-// Test for anonymous namespace internal linkage
-
-// { dg-do compile }
-// { dg-final { scan-assembler-not "globl.*_ZN.*1fEv" } }
-
-namespace
-{
-  int f() { }
-}
diff --git a/gcc/testsuite/g++.dg/ext/visibility/anon2.C b/gcc/testsuite/g++.dg/ext/visibility/anon2.C
deleted file mode 100644
index 1d8e479b9ff..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/anon2.C
+++ /dev/null
@@ -1,11 +0,0 @@
-// Test for propagation of anonymous namespace internal linkage
-
-// { dg-do compile }
-// { dg-final { scan-assembler-not "globl.*_Z1fv" } }
-
-namespace
-{
-  struct A { };
-}
-
-A f () { }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/class1.C b/gcc/testsuite/g++.dg/ext/visibility/class1.C
deleted file mode 100644
index d5265146da5..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/class1.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// PR c++/26905
-// Init should not be hidden, so calling it should use the PLT.
-
-// { dg-require-visibility "" }
-// { dg-options "-fpic" }
-// { dg-do compile { target i?86-*-* x86_64-*-* } }
-// { dg-final { scan-assembler "InitEv@PLT" } }
-
-#pragma GCC visibility push(hidden)
-struct __attribute__ ((visibility ("default"))) nsINIParser
-{
-    static void Init();
-};
-
-__attribute__ ((visibility ("default")))
-void
-CheckCompatibility(void)
-{
-  nsINIParser::Init();
-}
diff --git a/gcc/testsuite/g++.dg/ext/visibility/local1.C b/gcc/testsuite/g++.dg/ext/visibility/local1.C
deleted file mode 100644
index 7a04db60115..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/local1.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// PR c++/19238
-// Test that hidden visibility on an inline function is inherited by static
-// local variables and local classes.
-
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_Z1fv" } }
-// { dg-final { scan-hidden "_ZZ1fvE1i" } }
-// { dg-final { scan-hidden "_ZZ1fvEN1A1fEv" } }
-
-__attribute ((visibility ("hidden"))) inline int
-f()
-{
-  static int i = 2;
-  struct A
-  {
-    void f () { }
-  } a;
-  a.f();
-  return i;
-}
-
-int main()
-{
-  f();
-}
diff --git a/gcc/testsuite/g++.dg/ext/visibility/namespace1.C b/gcc/testsuite/g++.dg/ext/visibility/namespace1.C
deleted file mode 100644
index b7773dc9d61..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/namespace1.C
+++ /dev/null
@@ -1,30 +0,0 @@
-// PR c++/21764
-// Test for namespace visibility attribute semantics.
-
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_ZN3foo1fEv" } }
-// { dg-final { scan-hidden "_ZN3foo1gEv" } }
-// { dg-final { scan-hidden "_ZN3foo1A1mEv" } }
-// { dg-final { scan-hidden "_ZN3foo1tIiEEvv" } }
-// { dg-final { scan-not-hidden "_ZN3foo1hEv" } }
-
-namespace foo __attribute ((visibility ("hidden")))
-{
-  int f() { }
-  void g();
-  template <typename T> void t() { }
-  class A
-  {
-    void m ();
-  };
-}
-
-namespace foo
-{
-  void h() {}
-}
-
-void foo::g() { t<int> (); }
-
-void foo::A::m() { }
-
diff --git a/gcc/testsuite/g++.dg/ext/visibility/prop1.C b/gcc/testsuite/g++.dg/ext/visibility/prop1.C
deleted file mode 100644
index f4574820d32..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/prop1.C
+++ /dev/null
@@ -1,23 +0,0 @@
-// Test for propagation of visibility through template arguments
-
-// { dg-do compile }
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_Z1fIN1N1AEEvT_" } }
-// { dg-final { scan-hidden "_Z1hIXadL_ZN1N1iEEEEvv" } }
-
-namespace N __attribute ((__visibility__ ("hidden")))
-{
-  struct A { };
-  int i;
-}
-
-template <class T> void f (T) { }
-template <int *I> void h() { }
-
-void g()
-{
-  N::A a;
-  f(a);
-  h<&N::i>();
-}
-
diff --git a/gcc/testsuite/g++.dg/ext/visibility/redecl1.C b/gcc/testsuite/g++.dg/ext/visibility/redecl1.C
deleted file mode 100644
index 75c85541852..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/redecl1.C
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test that we complain about redeclaration with different visibility
-
-struct __attribute((visibility("hidden"))) B;
-struct __attribute((visibility("default"))) B;	// { dg-warning "visibility" }
-
-__attribute ((visibility ("hidden"))) void f();	// { dg-warning "previous" }
-__attribute ((visibility ("default"))) void f(); // { dg-warning "visibility" }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/template1.C b/gcc/testsuite/g++.dg/ext/visibility/template1.C
deleted file mode 100644
index c5cee0d4b17..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/template1.C
+++ /dev/null
@@ -1,35 +0,0 @@
-// PR c++/19134
-// -fvisibility-inlines-hidden doesn't apply to non-inline specializations
-
-// { dg-require-visibility "" }
-// { dg-options "-fvisibility-inlines-hidden" }
-// { dg-final { scan-not-hidden "_ZN1AIiE3fooEv" } }
-// { dg-final { scan-not-hidden "_ZN1AIiE3barEv" } }
-// { dg-final { scan-hidden "_ZN1AIlE3fooEv" } }
-// { dg-final { scan-hidden "_ZN1AIlE3barEv" } }
-// { dg-final { scan-hidden "_ZN1AIcE3barEv" } }
-
-template<class T>
-struct A {
-  void foo() {};
-  __attribute ((visibility ("hidden"))) void bar();
-};
-
-// This has default visibility.
-template<> void A<int>::foo() {}
-
-// This has hidden visibility because of -fvisibility-inlines-hidden.
-template<> inline void A<long>::foo() {}
-// Force the inline out.
-void f () { A<long> a; a.foo(); }
-
-// This has default visibility.
-template<> __attribute ((visibility ("default"))) void A<int>::bar() {}
-
-// This inherits hidden visibility from its template.
-template<> void A<long>::bar() { }
-
-// This also has hidden visibility; #pragma vis doesn't affect class members.
-#pragma GCC visibility push(default)
-template<> void A<char>::bar() { }
-#pragma GCC visibility pop
diff --git a/gcc/testsuite/g++.dg/ext/visibility/template2.C b/gcc/testsuite/g++.dg/ext/visibility/template2.C
deleted file mode 100644
index 8db96db5649..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/template2.C
+++ /dev/null
@@ -1,35 +0,0 @@
-// PR c++/27000
-// Implicitly instantiated templates should not be affected by
-// #pragma visibility.
-
-/* { dg-do compile } */
-/* { dg-require-visibility "" } */
-/* { dg-final { scan-not-hidden "_ZN1SIiED1Ev" } } */
-/* { dg-final { scan-not-hidden "_ZN1SIiEC1ERKi" } } */
-
-template <class T>
-struct S
-{
-  S (const T &);
-  ~S ();
-  T t;
-};
-
-template <class T>
-S<T>::S (const T &x)
-{
-  t = x;
-}
-
-template <class T>
-S<T>::~S ()
-{
-}
-
-#pragma GCC visibility push(hidden)
-struct U
-{
-  S<int> s;
-  U () : s (6) { }
-} u;
-#pragma GCC visibility pop
diff --git a/gcc/testsuite/g++.dg/ext/visibility/template3.C b/gcc/testsuite/g++.dg/ext/visibility/template3.C
deleted file mode 100644
index 69cb6caba77..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/template3.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// PR c++/17470
-// Test that we can give visibility to explicit template instantiations
-
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_ZN1AIlE1fEl" } }
-// { dg-final { scan-hidden "_ZN1AIiE1fEi" } }
-// { dg-final { scan-not-hidden "_ZN1AIcE1fEc" } }
-// { dg-final { scan-hidden "_Z8identityIdET_S0_" } }
-// { dg-final { scan-not-hidden "_Z8identityIiET_S0_" } }
-
-template <class T> T identity(T t) { return t; }
-template  __attribute__((visibility("hidden"))) double identity(double);
-template int identity(int);
-
-
-template <class T> struct A { void f (T); };
-template <class T> void A<T>::f (T) { }
-template struct __attribute ((visibility ("hidden"))) A<int>;
-template<> struct  __attribute ((visibility ("hidden"))) A<long> { void f(long); };
-// inherits hidden visibility from its class
-void A<long>::f (long) { }
-template struct A<char>;
diff --git a/gcc/testsuite/g++.dg/ext/visibility/template4.C b/gcc/testsuite/g++.dg/ext/visibility/template4.C
deleted file mode 100644
index add63a5934b..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/template4.C
+++ /dev/null
@@ -1,39 +0,0 @@
-// Test for explicit visibility on template vs. #pragma vis at explicit
-// instantiation/specialization point for plain function templates.
-
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_Z3fooIdEvT_" } }
-// { dg-final { scan-hidden "_Z3fooIlEvT_" } }
-// { dg-final { scan-hidden "_Z3fooIcEvT_" } }
-// { dg-final { scan-hidden "_Z3fooIiEvT_" } }
-// { dg-final { scan-not-hidden "_Z3fooIfEvT_" } }
-// { dg-final { scan-not-hidden "_Z3fooIsEvT_" } }
-
-// { dg-final { scan-hidden "_Z3barIdEvT_" } }
-// { dg-final { scan-hidden "_Z3barIlEvT_" } }
-// { dg-final { scan-hidden "_Z3barIiEvT_" } }
-// { dg-final { scan-hidden "_Z3barIcEvT_" } }
-// { dg-final { scan-not-hidden "_Z3barIfEvT_" } }
-// { dg-final { scan-not-hidden "_Z3barIsEvT_" } }
-
-#pragma GCC visibility push(hidden)
-template <class T> void bar(T) { }
-#pragma GCC visibility pop
-template void bar (long);
-template<> void bar (double) { }
-template __attribute ((visibility ("default"))) void bar (short);
-template<> __attribute ((visibility ("default"))) void bar (float) { }
-#pragma GCC visibility push(default)
-template<> void bar(char) { }
-template void bar(int);
-#pragma GCC visibility pop
-
-template <class T> __attribute ((visibility ("hidden"))) void foo(T) { }
-template void foo (long);
-template<> void foo (double) { }
-template __attribute ((visibility ("default"))) void foo (short);
-template<> __attribute ((visibility ("default"))) void foo (float) { }
-#pragma GCC visibility push(default)
-template<> void foo(char) { }
-template void foo(int);
-#pragma GCC visibility pop
diff --git a/gcc/testsuite/g++.dg/ext/visibility/template6.C b/gcc/testsuite/g++.dg/ext/visibility/template6.C
deleted file mode 100644
index 7892a46e2aa..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/template6.C
+++ /dev/null
@@ -1,17 +0,0 @@
-// Test for explicit visibility taking precedence
-
-// { dg-require-visibility "" }
-// { dg-final { scan-not-hidden "_ZN1AIiE1fEv" } }
-
-template <class T> struct A
-{
-  // This attribute takes precedence over...
-  __attribute ((visibility ("default"))) void f ();
-};
-
-template <class T>
-void A<T>::f ()
-{ }
-
-// ...this attribute.
-template struct __attribute ((visibility ("hidden"))) A<int>;
diff --git a/gcc/testsuite/g++.dg/ext/visibility/typeinfo1.C b/gcc/testsuite/g++.dg/ext/visibility/typeinfo1.C
deleted file mode 100644
index 99dfc1cd76d..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/typeinfo1.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// PR c++/26984
-// lazily generated typeinfos should not be affected by #pragma vis, but
-// they should be affected by the visibility of the type they describe.
-
-// { dg-require-visibility "" }
-// { dg-options "-fvisibility-inlines-hidden" }
-// { dg-final { scan-not-hidden "_ZTIPPi" } }
-// { dg-final { scan-not-hidden "_ZTSPPi" } }
-// { dg-final { scan-hidden "_ZTIP1A" } }
-// { dg-final { scan-hidden "_ZTSP1A" } }
-
-#include <typeinfo>
-
-#pragma GCC visibility push(hidden)
-const std::type_info* t = &(typeid(int **));
-struct A { };
-#pragma GCC visibility pop
-
-const std::type_info* t2 = &(typeid(A *));
diff --git a/gcc/testsuite/g++.dg/ext/visibility/warn1.C b/gcc/testsuite/g++.dg/ext/visibility/warn1.C
deleted file mode 100644
index 3b6b85f365a..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/warn1.C
+++ /dev/null
@@ -1,13 +0,0 @@
-// Warn when a declaration is specified with greater visibility than that
-// of its type.
-
-// { dg-do compile }
-// { dg-require-visibility "" }
-// { dg-final { scan-hidden "_Z1fv" } }
-
-namespace N __attribute ((__visibility__ ("hidden")))
-{
-  struct A { };
-}
-
-N::A f() { } // { dg-warning "visibility" "" }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/warn2.C b/gcc/testsuite/g++.dg/ext/visibility/warn2.C
deleted file mode 100644
index 54354b52311..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/warn2.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// Complain when a class is specified with greater visibility than one of
-// its members' types or bases, and when a declaration has greater
-// visibility than its type.
-
-// { dg-require-visibility "" }
-
-namespace N __attribute ((__visibility__ ("hidden")))
-{
-  struct A { };
-}
-
-struct B
-{				// { dg-warning "visibility" }
-  N::A a;
-};
-
-N::A f () { }			// { dg-warning "visibility" }
-
-struct C: public N::A { };	// { dg-warning "visibility" }
diff --git a/gcc/testsuite/g++.dg/ext/visibility/warn3.C b/gcc/testsuite/g++.dg/ext/visibility/warn3.C
deleted file mode 100644
index de64217fd3b..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/warn3.C
+++ /dev/null
@@ -1,32 +0,0 @@
-// Tests for various visibility mismatch situations.
-
-// { dg-require-visibility "" }
-
-// { dg-final { scan-not-hidden "_ZN1A1fEv" } }
-
-struct __attribute ((visibility ("hidden"))) A
-{
-  // This is OK, A::f gets default visibility.
-  __attribute ((visibility ("default"))) void f ();
-};
-
-void A::f() { }
-
-// This gets a warning; it should have explicit visibility of some sort.
-A* afactory1() { return new A; }	// { dg-warning "visibility" }
-
-// This is OK.
-__attribute ((visibility ("default"))) A*
-afactory2 () { return new A; }
-
-// This gets a warning.
-struct B
-{				// { dg-warning "visibility" }
-  A a;
-};
-
-// This one has explicit visibility, so it doesn't get a warning.
-struct __attribute ((visibility ("default"))) C
-{
-  A a;
-};
diff --git a/gcc/testsuite/g++.dg/ext/visibility/warn4.C b/gcc/testsuite/g++.dg/ext/visibility/warn4.C
deleted file mode 100644
index e405e7a74c8..00000000000
--- a/gcc/testsuite/g++.dg/ext/visibility/warn4.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// Error if we try to give an instantiation visibility after it's already
-// been instantiated.
-
-// { dg-require-visibility "" }
-
-template <class T> struct A { void f (T); };
-template <class T> void A<T>::f (T) { }
-
-A<double> ad;
-template struct __attribute ((visibility ("hidden"))) A<double>; // { dg-error "already defined" }
diff --git a/gcc/testsuite/g++.dg/lookup/anon5.C b/gcc/testsuite/g++.dg/lookup/anon5.C
deleted file mode 100644
index c3d36c20f53..00000000000
--- a/gcc/testsuite/g++.dg/lookup/anon5.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// PR c++/28409
-// shouldIbevisible should be emitted because it's an extern "C" decl with
-// external linkage, even though it's in the anonymous namespace.
-
-namespace
-{
-  extern "C" int shouldIbevisible()
-  {
-    return 0;
-  }
-}
-
-namespace t
-{
-  extern "C" int shouldIbevisible(void);
-}
-
-int main(void)
-{
-  return t::shouldIbevisible();
-}
diff --git a/gcc/testsuite/g++.dg/template/anon2.C b/gcc/testsuite/g++.dg/template/anon2.C
deleted file mode 100644
index 75285ade379..00000000000
--- a/gcc/testsuite/g++.dg/template/anon2.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// PR c++/28279
-// finish_static_data_member_decl was confused by the anonymous
-// namespace causing TREE_PUBLIC to be unset
-
-template<typename T>
-struct is_pointer_impl {
-    static const bool value = true;
-};
-
-namespace {
-  class prefix_name_mapper {};
-}
-
-static const bool val = is_pointer_impl<prefix_name_mapper>::value;
-
diff --git a/gcc/testsuite/g++.dg/template/anon3.C b/gcc/testsuite/g++.dg/template/anon3.C
deleted file mode 100644
index eee7acd820f..00000000000
--- a/gcc/testsuite/g++.dg/template/anon3.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// PR c++/28370
-// { dg-do run }
-
-namespace
-{
-  template<typename T> struct A { static int *a; };
-  template<typename T> int *A<T>::a = 0;
-}
-
-int *
-foo ()
-{
-  return A<int>::a;
-}
-
-int
-main ()
-{
-  return foo() != 0;
-}
diff --git a/gcc/testsuite/g++.dg/template/anon4.C b/gcc/testsuite/g++.dg/template/anon4.C
deleted file mode 100644
index 59bfee1e814..00000000000
--- a/gcc/testsuite/g++.dg/template/anon4.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// PR c++/28407
-// A declaration in the anonymous namespace still has external linkage.
-
-template <int *P> class A { };
-namespace
-{
-  int i;
-}
-
-A<&i> a;