[llvm-commits] [llvm-gcc-4.2] r48611 - in /llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple: 5591491.C 5596043.C R5562718.C init-1.C init-2.C pragma-1.C r5614435.C

[Bill Wendling]

Author: void
Date: Thu Mar 20 16:26:03 2008
New Revision: 48611

URL: http://llvm.org/viewvc/llvm-project?rev=48611&view=rev
Log:
Merge error. Tests included redundantly.

Modified:
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5591491.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5596043.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/R5562718.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pragma-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/r5614435.C

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5591491.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/5591491.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5591491.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5591491.C Thu Mar 20 16:26:03 2008
@@ -28,35 +28,3 @@
 
  v1->f4.f2 = v3.f2;
 }
-
-/* APPLE LOCAL file radar 5591491 */
-/* { dg-options "-O2" } */
-/* { dg-do compile { target *-*-darwin* } } */
-
-typedef union {
-  unsigned char f1[4];
-} u1;
-class c1 {
-public:
-  u1 f2;
-};
-
-class c3 {
-public:
-  c1             f4;
-};
-
-class c4 {
-  virtual int m1();
-};
-
-int c4::m1()
-{
-  c3 *v1;
-  struct {
-    u1        f2;
-  } v3 = {};
-
- v1->f4.f2 = v3.f2;
-}
-

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5596043.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/5596043.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5596043.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/5596043.C Thu Mar 20 16:26:03 2008
@@ -35,40 +35,3 @@
   bar ();
   return 0;
 }
-/* APPLE LOCAL file radar 5591491 */
-/* { dg-options "-O2" } */
-/* { dg-do run { target powerpc**-*-darwin* } } */
-
-struct T {
-  volatile unsigned int word;
-  inline void foo ()
-  {
-    __asm__ __volatile__(
-                        "isync\n\t"
-                        "eieio\n\t"
-                        "stw %1, %0"
-                        :"=m" (word)
-                        :"r" (0)
-                        :"memory"
-                        );
-  }
-};
-
-struct Span {
-  unsigned int size:8;
-};
-
-static T data[10];
-
-void bar ()
-{
-  Span* span;
-  const long unsigned int cl = span->size;
-  data[cl].foo();
-}
-
-int main ()
-{
-  bar ();
-  return 0;
-}

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/R5562718.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/R5562718.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/R5562718.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/R5562718.C Thu Mar 20 16:26:03 2008
@@ -44,49 +44,3 @@
 }
 /* Compiler should not emit increment of address "4".  */
 /* { dg-final { scan-assembler-not "addl\t\\\$1, 4" } } */
-/* APPLE LOCAL file 5562718 */
-/* { dg-do compile } */
-/* { dg-options "-O2" } */
-namespace Foundation {
-  class RefCounted {
-  public:
-    virtual unsigned long getCFHashCode() const;
-    __attribute__((nothrow)) const RefCounted* retain() const
-    {
-      if (this)
-	++mRefCount;
-      return this;
-    }
-    mutable unsigned mRefCount;
-  };
-  template <class R> class Ref {
-  public:
-    Ref() :mValue(__null)
-    {}
-    Ref( R *r ) :mValue((R*)r->retain())
-    {}
-    __attribute__((always_inline)) inline R* get() const
-    {
-      return mValue;
-    }
-    mutable R *mValue;
-  };
-  template <class R> class Returner
-  {
-  public:
-    template <class T> __attribute__((always_inline)) inline Returner( const Ref<T> &ref ) : mValue((R*)ref.get()->retain()) {}
-    mutable R *mValue;
-  };
-}
-using namespace Foundation;
-namespace SQLite
-{
-  class Row :
-    public RefCounted {};
-}
-using namespace SQLite;
-Returner<Row> foobar() {
-  return Ref<Row>(__null);
-}
-/* Compiler should not emit increment of address "4".  */
-/* { dg-final { scan-assembler-not "addl\t\\\$1, 4" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/init-1.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-1.C Thu Mar 20 16:26:03 2008
@@ -7,12 +7,3 @@
   ~Foo() { }
 };
 Foo foo;
-/* APPLE LOCAL file elide global inits 5642351 */
-/* { dg-do compile } */
-/* { dg-options "-fno-use-cxa-atexit" } */
-/* { dg-final { scan-assembler-not "_GLOBAL__I_" } } */
-
-struct Foo {
-  ~Foo() { }
-};
-Foo foo;

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/init-2.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-2.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/init-2.C Thu Mar 20 16:26:03 2008
@@ -5,10 +5,3 @@
 typedef float vFloat __attribute__ ((__vector_size__ (16)));
 static const vFloat _minusZero = (const vFloat) { -0.0f, -0.0f, -0.0f, -0.0f };
 const vFloat *p = &_minusZero;
-/* APPLE LOCAL file AltiVec 5527030 */
-/* { dg-do compile } */
-/* { dg-final { scan-assembler-not "_GLOBAL__I_" } } */
-
-typedef float vFloat __attribute__ ((__vector_size__ (16)));
-static const vFloat _minusZero = (const vFloat) { -0.0f, -0.0f, -0.0f, -0.0f };
-const vFloat *p = &_minusZero;

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pragma-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/pragma-1.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pragma-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/pragma-1.C Thu Mar 20 16:26:03 2008
@@ -4,9 +4,3 @@
 
 #pragma mark Mike's world
 int i;
-/* APPLE LOCAL file 5614511 */
-/* { dg-do compile } */
-/* Radar 5614511 */
-
-#pragma mark Mike's world
-int i;

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/r5614435.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/r5614435.C?rev=48611&r1=48610&r2=48611&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/r5614435.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/r5614435.C Thu Mar 20 16:26:03 2008
@@ -16,21 +16,3 @@
 {
   return;
 }
-/* APPLE LOCAL file 5614435 */
-/* { dg-options "-O3" } */
-/* { dg-compile } */
-/* Radar 5614435 */
-
-typedef const struct __CFDictionary * CFDictionaryRef;
-typedef struct __CFDictionary * CFMutableDictionaryRef;
-void QEQueryElementSetArgumentsArray(CFMutableDictionaryRef element);
-void QEQueryElementGetArguments(CFDictionaryRef element)
-{
-  QEQueryElementSetArgumentsArray((CFMutableDictionaryRef)element);
-}
-
-void
-QEQueryElementSetArgumentsArray(CFMutableDictionaryRef element)
-{
-  return;
-}