[llvm-commits] [llvm-gcc-4.2] r55724 - in /llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg: ext/align1.C ext/apple-r4168392.C gomp/macro-3.C inline-limit-1.C opt/alias2.C

[Bill Wendling]

Author: void
Date: Wed Sep  3 15:46:10 2008
New Revision: 55724

URL: http://llvm.org/viewvc/llvm-project?rev=55724&view=rev
Log:
Change formatting and generally sync up with Apple's GCC r150332.

Removed:
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/apple-r4168392.C
Modified:
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/align1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/gomp/macro-3.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/inline-limit-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/opt/alias2.C

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/align1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/ext/align1.C?rev=55724&r1=55723&r2=55724&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/align1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/align1.C Wed Sep  3 15:46:10 2008
@@ -16,6 +16,7 @@
 int
 main (void)
 {
-  printf ("%d %d\n", __alignof (a1), __alignof (f1));
+  /* APPLE LOCAL default to Wformat-security 5764921 */
+  printf ("%d %d\n", (int)__alignof (a1), (int)__alignof (f1));
   return (__alignof (a1) < __alignof (f1));
 }

Removed: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/apple-r4168392.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/ext/apple-r4168392.C?rev=55723&view=auto

==============================================================================
    (empty)

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/gomp/macro-3.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/gomp/macro-3.C?rev=55724&r1=55723&r2=55724&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/gomp/macro-3.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/gomp/macro-3.C Wed Sep  3 15:46:10 2008
@@ -1,6 +1,5 @@
 // PR preprocessor/27746
 // { dg-do compile }
-// { dg-require-fdump "" }
 // { dg-options "-fopenmp -fdump-tree-omplower" }
 
 #define omp		FOO

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/inline-limit-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/inline-limit-1.C?rev=55724&r1=55723&r2=55724&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/inline-limit-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/inline-limit-1.C Wed Sep  3 15:46:10 2008
@@ -11,25 +11,22 @@
    but this testcase is expected to require revision every time the
    GCC inlining heuristics change.  */
 
-/* CALLs with three int arguments and no return type are assumed to generate 5
-   'estimated insns'. */
-extern void bulk (int, int, int);
+extern void bulk (int);	/* CALLs are assumed to generate 10 'estimated insns'.  */
 
 /* Inlining limits for inline and non-inline functions are currently
-   identical for C++.  Empirically, a body with few instructions will be
-   inlined, and a body with several calls will not.  */
+   identical for C++.  Empirically, a body with one will be inlined,
+   and a body with two calls will not.  */
 
 void
 calleex1 (void)
 {
-  bulk (1,1,1); bulk (2,1,1); bulk (3,1,1); bulk (4,1,1);
-  bulk (5,1,1); bulk (6,1,1);
+  bulk (1); bulk (2);
 }
 
-void
+void inline
 inlinex1 (void)
 {
-  bulk (1,4,2);
+  bulk (1);
 }
 
 int

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/opt/alias2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/opt/alias2.C?rev=55724&r1=55723&r2=55724&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/opt/alias2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/opt/alias2.C Wed Sep  3 15:46:10 2008
@@ -30,14 +30,16 @@
 
 
 _Deque_base::~_Deque_base() {
-  printf ("bb %x %x\n", this, *_M_start._M_node);
+  /* APPLE LOCAL default to Wformat-security 5764921 */
+  printf ("bb %p %x\n", this, *_M_start._M_node);
 }
 
 void
 _Deque_base::_M_initialize_map()
 {
   yy = 0x123;
-  printf ("aa %x %x\n", this, yy);
+  /* APPLE LOCAL default to Wformat-security 5764921 */
+  printf ("aa %p %x\n", this, yy);
 
   _M_start._M_node = &yy;
   _M_start._M_cur = yy;