diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e8c983ba941..fc140487c81 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2009-06-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/util/testsuite_common_types.h (bitwise_operators,
+	bitwise_assignment_operators): Initialize a and b.
+	(struct has_bitwise_operators): Do not call the latter.
+	* testsuite/29_atomics/atomic_integral/cons/assign_neg.cc: Adjust
+	dg-error line numbers.
+	* testsuite/29_atomics/atomic_integral/cons/copy_neg.cc: Likewise.
+	* testsuite/29_atomics/atomic/cons/assign_neg.cc: Likewise.
+	* testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
+
 2009-06-22  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/23_containers/list/invalidation/1.cc: Mark test as
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
index e580d807585..0b73b080fbe 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
@@ -29,7 +29,7 @@ int main()
   return 0;
 }
 
-// { dg-error "used here" "" { target *-*-* } 521 }
+// { dg-error "used here" "" { target *-*-* } 525 }
 // { dg-error "deleted function" "" { target *-*-* } 239 }
 // { dg-error "deleted function" "" { target *-*-* } 257 }
 // { dg-error "deleted function" "" { target *-*-* } 275 } 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
index 9108b4bc1ac..a261a84c968 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
@@ -29,7 +29,7 @@ int main()
   return 0;
 }
 
-// { dg-error "used here" "" { target *-*-* } 560 } 
+// { dg-error "used here" "" { target *-*-* } 564 } 
 // { dg-error "deleted function" "" { target *-*-* } 238 }
 // { dg-error "deleted function" "" { target *-*-* } 256 }
 // { dg-error "deleted function" "" { target *-*-* } 274 }
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
index cf69ab2ee56..a488cb06d14 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/assign_neg.cc
@@ -30,11 +30,11 @@ int main()
   return 0;
 }
 
-// { dg-error "used here" "" { target *-*-* } 521 }
+// { dg-error "used here" "" { target *-*-* } 525 }
 // { dg-excess-errors "deleted function" } 
 // { dg-excess-errors "deleted function" } 
 // { dg-error "instantiated from" "" { target *-*-* } 29 } 
-// { dg-error "instantiated from" "" { target *-*-* } 528 } 
+// { dg-error "instantiated from" "" { target *-*-* } 532 } 
 // { dg-error "instantiated from" "" { target *-*-* } 170 } 
 // { dg-error "instantiated from" "" { target *-*-* } 399 }
 // { dg-error "instantiated from" "" { target *-*-* } 168 }  
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
index 369cba826f4..71eb282fcd8 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_integral/cons/copy_neg.cc
@@ -30,11 +30,11 @@ int main()
   return 0;
 }
 
-// { dg-error "used here" "" { target *-*-* } 560 }
+// { dg-error "used here" "" { target *-*-* } 564 }
 // { dg-excess-errors "deleted function" } 
 // { dg-excess-errors "deleted function" } 
 // { dg-error "instantiated from" "" { target *-*-* } 29 } 
-// { dg-error "instantiated from" "" { target *-*-* } 566 } 
+// { dg-error "instantiated from" "" { target *-*-* } 570 } 
 // { dg-error "instantiated from" "" { target *-*-* } 170 } 
 // { dg-error "instantiated from" "" { target *-*-* } 399 }
 // { dg-error "instantiated from" "" { target *-*-* } 168 }  
diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
index ba8a967feb3..c6c00689f3d 100644
--- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
+++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
@@ -387,8 +387,8 @@ namespace __gnu_test
     void
     bitwise_operators()
     {
-      _Tp a; 
-      _Tp b;
+      _Tp a = _Tp();
+      _Tp b = _Tp();
       a | b;
       a & b;
       a ^ b;
@@ -399,8 +399,8 @@ namespace __gnu_test
     void
     bitwise_assignment_operators()
     {
-      _Tp a; 
-      _Tp b;
+      _Tp a = _Tp();
+      _Tp b = _Tp();
       a |= b; // set
       a &= ~b; // clear
       a ^= b;
@@ -426,7 +426,11 @@ namespace __gnu_test
 	{
 	  void __constraint()
 	  {
-	    bitwise_assignment_operators<_Tp>();
+	    _Tp a;
+	    _Tp b;
+	    a |= b; // set
+	    a &= ~b; // clear
+	    a ^= b;
 	  }
 	};