[llvm-commits] [llvm-gcc-4.2] r101003 - in /llvm-gcc-4.2/trunk/gcc/testsuite: g++.apple/block-blocks-test-1.C g++.apple/block-debug-1.C g++.apple/block-debug-2.C g++.apple/block-ivar.C g++.apple/block-pointer.C g++.apple/cp-block-byref-2.C g++.apple/debug-inlined-section.C g++.apple/local.C g++.apple/namespace.C g++.apple/omit-destructor-call-scope.C g++.apple/pubtypes.C g++.apple/typedef.C g++.dg/abi/key2.C g++.dg/ext/instantiate2.C g++.dg/inline-limit-1.C g++.dg/parse/error17.C

Bill Wendling isanbard at gmail.com
Sun Apr 11 17:49:31 PDT 2010


Author: void
Date: Sun Apr 11 19:49:30 2010
New Revision: 101003

URL: http://llvm.org/viewvc/llvm-project?rev=101003&view=rev
Log:
Cleanup a few of the g++ tests. Mostly adding "-fverbose-asm" and correcting a
few other minor things to make them pass.

Modified:
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-ivar.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-pointer.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/cp-block-byref-2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/debug-inlined-section.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/local.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/namespace.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pubtypes.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/typedef.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/abi/key2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/instantiate2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/inline-limit-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/parse/error17.C

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-blocks-test-1.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-1.C Sun Apr 11 19:49:30 2010
@@ -1,15 +1,16 @@
+/* LLVM LOCAL - whole file */
 /* APPLE LOCAL file 5932809 */
 /* { dg-options "-fblocks" } */
 /* { dg-do compile } */
 
-__block  int X; /* { dg-warning "__block attribute is only allowed on local variables - ignored" } */
+__block  int X; /* { dg-error "__block attribute on 'X' not allowed, only allowed on local variables" } */
 
-int foo(__block int param) { /* { dg-warning "__block attribute can be specified on variables only - ignored" } */
+int foo(__block int param) { /* { dg-error "__block attribute can be specified on variables only" } */
   __block int OK = 1;
 
-  extern __block double extern_var;	/* { dg-warning "__block attribute is only allowed on local variables - ignored" } */
+  extern __block double extern_var; /* { dg-error "__block attribute on 'extern_var' not allowed, only allowed on local variables" } */
   if (X) {
-	static __block char * pch;	/* { dg-warning "__block attribute is only allowed on local variables - ignored" } */	
+    static __block char * pch; /* { dg-error "__block attribute on 'pch' not allowed, only allowed on local variables" } */
   }
   return OK - 1;
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-debug-1.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-1.C Sun Apr 11 19:49:30 2010
@@ -3,7 +3,8 @@
    member that is a pointer to a block.  */
 
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -fblocks -dA" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-g -O0 -fblocks -dA -fverbose-asm" } */
 /* { dg-final { scan-assembler "__block_descriptor.*DW_AT_name" } } */
 /* { dg-final { scan-assembler "__block_literal_generic.*DW_AT_name" } } */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-debug-2.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-debug-2.C Sun Apr 11 19:49:30 2010
@@ -3,7 +3,8 @@
    to a block.  */
 
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -fblocks -dA" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-g -O0 -fblocks -dA -fverbose-asm" } */
 /* { dg-final { scan-assembler "__block_descriptor.*DW_AT_name" } } */
 /* { dg-final { scan-assembler "__block_literal_generic.*DW_AT_name" } } */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-ivar.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-ivar.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-ivar.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-ivar.C Sun Apr 11 19:49:30 2010
@@ -5,7 +5,9 @@
 
 #import <Foundation/Foundation.h>
 
-extern "C" void *Block_copy(const void *aBlock);
+/* LLVM LOCAL - begin */
+/* Remove forward decl of Block_copy */
+/* LLVM LOCAL - end */
 
 @interface TestObject : NSObject {
 @public

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-pointer.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-pointer.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-pointer.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-pointer.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* APPLE LOCAL file - testcase for Radar 5811943  */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -fblocks -dA" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-g -O0 -fblocks -dA -fverbose-asm" } */
 /* { dg-final { scan-assembler "DW_AT_APPLE_block" } } */
 
 #include <stdio.h>

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/cp-block-byref-2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/cp-block-byref-2.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/cp-block-byref-2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/cp-block-byref-2.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* APPLE LOCAL file radar 6237086  */
 /* { dg-do compile } */
-/* { dg-options "-g -O0 -dA -mmacosx-version-min=10.6" }*/
+/* LLVM LOCAL */
+/* { dg-options "-g -O0 -dA -fverbose-asm -mmacosx-version-min=10.6" }*/
 /* { dg-final { scan-assembler "DW_OP_fbreg+\[ \t\n]+\[ \t]\\.byte+\[ \t]0x\[0-9a-f]+\[ \t]+\[#;@]\[ \t]sleb128 -\[0-9]+\[ \t\n]+\[ \t]\\.byte+\[ \t]0x6+\[ \t]+\[#;@]\[ \t]DW_OP_deref+\[ \t\n]+\[ \t]\\.byte+\[ \t]\[0x6;0x23]+\[ \t]+\[#;@]\[ \t]\[DW_OP_deref;DW_OP_plus_uconst]" } } */
 
 #include <stdio.h>

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/debug-inlined-section.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/debug-inlined-section.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/debug-inlined-section.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/debug-inlined-section.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* APPLE LOCAL file, Radar 6275985  */
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-O1 -gdwarf-2 -dA" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-O1 -gdwarf-2 -dA -fverbose-asm" } */
 /* { dg-final { scan-assembler "__debug_inlined" } } */
 /* { dg-final { scan-assembler "\[#;@]+\[ \t]+MIPS linkage name: \"_ZNK1UcvPKcEv\"" } } */
 /* { dg-final { scan-assembler "\[#;@]+\[ \t]+Function name: \"operator const char" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/local.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/local.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/local.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/local.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* Radar 5636185  */
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-O0 -gdwarf-2 -dA -c -Wno-deprecated-declarations" } */
+/* LLVM LOCAL - -fverbose-asm
+/* { dg-options "-O0 -gdwarf-2 -dA -fverbose-asm -c -Wno-deprecated-declarations" } */
 /* { dg-final { scan-assembler "DW_AT_MIPS_linkage_name" } } */
 /* { dg-final { scan-assembler "_Z7marker1v" } } */
 /* { dg-final { scan-assembler "_Z7marker2v" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/namespace.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/namespace.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/namespace.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/namespace.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* Radar 5636185  */
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-O0 -gdwarf-2 -dA -c -Wno-deprecated-declarations" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-O0 -gdwarf-2 -dA -fverbose-asm -c -Wno-deprecated-declarations" } */
 /* { dg-final { scan-assembler "DW_AT_MIPS_linkage_name" } } */
 /* { dg-final { scan-assembler "_ZN1C12_GLOBAL__N_11F12_GLOBAL__N_14cXfXE" } } */
 /* { dg-final { scan-assembler "_ZN1C12_GLOBAL__N_12cXE" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/omit-destructor-call-scope.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C Sun Apr 11 19:49:30 2010
@@ -1,4 +1,6 @@
 /* APPLE LOCAL file 5559195 */
+// LLVM LOCAL - -m32
+// { dg-options "-m32" }
 // { dg-do compile }
 // { dg-final { scan-assembler-not "(\tcall|\tbl)\[ 	\]*__ZN6ClassAD1Ev" } }
 // { dg-final { scan-assembler "(\tcall|\tbl)\[ 	\]*__ZN6ClassBD1Ev" } }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pubtypes.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/pubtypes.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pubtypes.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pubtypes.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* Radar 4535968 */
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-O0 -gdwarf-2 -dA -fno-eliminate-unused-debug-types" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-O0 -gdwarf-2 -dA -fverbose-asm -fno-eliminate-unused-debug-types" } */
 /* { dg-final { scan-assembler "__debug_pubtypes" } } */
 /* APPLE LOCAL begin ARM assembler uses @ for comments */
 /* { dg-final { scan-assembler "long+\[ \t\]+\(0x\)?\[0-9a-f]+\[ \t\n\]+\[#;@]+\[ \t\]+Length of Public Type Names Info" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/typedef.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/typedef.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/typedef.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/typedef.C Sun Apr 11 19:49:30 2010
@@ -1,7 +1,8 @@
 /* APPLE LOCAL file, C++ typedefs of anonymous structs.  */
 /* Radar 6007135  */
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-O0 -gdwarf-2 -dA" } */
+/* LLVM LOCAL - -fverbose-asm */
+/* { dg-options "-O0 -gdwarf-2 -dA -fverbose-asm" } */
 /* { dg-final { scan-assembler "DW_TAG_typedef" } } */
 
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/abi/key2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/abi/key2.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/abi/key2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/abi/key2.C Sun Apr 11 19:49:30 2010
@@ -3,12 +3,12 @@
 
 // { dg-do compile { target *-*-darwin* } }
 // LLVM LOCAL begin rearrange tests to check current syntax
-// { dg-final { scan-assembler "	.section.*__DATA,__const_coal,coalesced\\n	.globl __ZTV1f\\n	.weak_definition __ZTV1f\\n" } }
-// { dg-final { scan-assembler "	.section.*__TEXT,__const_coal,coalesced\\n	.globl __ZTS1f\\n	.weak_definition __ZTS1f\\n" } }
+// { dg-final { scan-assembler "	.section	__DATA,__const_coal,coalesced\\n	.globl	__ZTV1f\\n	.weak_definition __ZTV1f\\n" } }
+// { dg-final { scan-assembler "	.section	__TEXT,__const_coal,coalesced\\n	.globl	__ZTS1f\\n	.weak_definition __ZTS1f\\n" } }
 //  With llvm ZTI1f is in the right place, but the ordering is different
 // so the .section directive is not needed.  Do the best we can.
 // (It belongs in the same place as ZTV1f.)
-// { dg-final { scan-assembler ".globl __ZTI1f\\n	.weak_definition __ZTI1f\\n" } }
+// { dg-final { scan-assembler ".globl	__ZTI1f\\n	.weak_definition __ZTI1f\\n" } }
 // LLVM LOCAL end
 
 class f

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/instantiate2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/ext/instantiate2.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/instantiate2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/ext/instantiate2.C Sun Apr 11 19:49:30 2010
@@ -8,7 +8,8 @@
 template <class T> T A<T>::t = 0;
 static template struct A<int>;
 
-// { dg-final { scan-assembler "\n_?_ZN1AIiE1tE(:|\n|\t)" } }
+// LLVM LOCAL
+// { dg-final { scan-assembler ".zerofill __DATA,__common,__ZN1AIiE1tE,4,2" }
 void test_int() { A<int>::t = 42; }
 
 // { dg-final { scan-assembler-not "\n_?_ZN1AIcE1tE(:|\n|\t)" } }

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=101003&r1=101002&r2=101003&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 Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 /* APPLE LOCAL file 4209014 4210936 */
 /* { dg-do compile } */
-/* { dg-options "-Os" } */
+/* LLVM LOCAL -m32 */
+/* { dg-options "-Os -m32" } */
 /* Call to inlinex1 should be inlined.  */
 /* { dg-final { scan-assembler-not "(\tcall|\tbl)\[ 	a-zA-Z0-9_\]*inlinex1" } } */
 /* Call to calleex1 should be called, not inlined.  */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/parse/error17.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.dg/parse/error17.C?rev=101003&r1=101002&r2=101003&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/parse/error17.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.dg/parse/error17.C Sun Apr 11 19:49:30 2010
@@ -1,6 +1,7 @@
 // PR c++/16965
 
-template <typename T> struct B { 
+// LLVM LOCAL
+template <typename T> struct B { // { dg-error "" }
   static int Bar(T); // { dg-error "" }
 }; 
 struct D : B<int>, B<char> {}; 





More information about the llvm-commits mailing list